CORD-1400: Physical pod config with the new build system
Change-Id: I5e01bb8af4e5f43182406b81481dd4ca70d0e70c
diff --git a/ansible/roles/genconfig/templates/inventory.ini.j2 b/ansible/roles/genconfig/templates/inventory.ini.j2
index adad512..54b71c1 100644
--- a/ansible/roles/genconfig/templates/inventory.ini.j2
+++ b/ansible/roles/genconfig/templates/inventory.ini.j2
@@ -23,7 +23,7 @@
{% macro group_template(groupname) %}
{% if inventory_groups[groupname] %}
{% for g_key, g_val in inventory_groups[groupname].iteritems() %}
-{{ g_key }}{% if g_val %} {% for key, val in g_val.iteritems() %}{{ key ~ "=" ~ val }}{% endfor %}{% endif %}
+{{ g_key }}{% if g_val %} {% for key, val in g_val.iteritems() %}{{ key ~ "=" ~ val ~ " "}}{% endfor %}{% endif %}
{% endfor %}
{% endif %}
diff --git a/podconfig/rcord-physical.yml b/podconfig/rcord-physical.yml
new file mode 100644
index 0000000..80f47d8
--- /dev/null
+++ b/podconfig/rcord-physical.yml
@@ -0,0 +1,83 @@
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+---
+# rcord-physical-example Pod Config
+# Example configuration for a physical R-CORD pod
+
+cord_scenario: cord
+cord_profile: rcord
+
+
+vagrant_vms:
+ - corddev
+
+# Variables
+credentials_dir: '/opt/credentials'
+pki_dir: '/opt/pki'
+ssh_pki_dir: '/opt/ssh_pki'
+
+fabric_ip: '10.6.1.1/24'
+management_ip: '10.6.0.1/24'
+external_ip: '10.90.0.252/16'
+external_gw: '10.90.0.1'
+external_iface: 'eth0'
+management_network: 10.6.0.0/24
+
+deploy_docker_registry: "10.90.0.252:5000"
+
+headnode: cord@10.90.0.252
+
+# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
+# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
+# one level up from the `cord` directory
+host_cord_profile_dir: "~/dev/cord_profile"
+
+build_targets:
+ - setup-automation
+
+skipTags:
+ - 'set_compute_node_password'
+ - 'switch_support'
+
+# Wait until headnode prepped before building containers, for consistent DNS
+docker_images_prereqs:
+ - prep-headnode
+
+# node topology
+physical_node_list:
+ - name: head1
+ aliases:
+ - head
+
+# Inventory for ansible, used to generate inventory.ini
+inventory_groups:
+
+ config:
+ localhost:
+ ansible_connection: local
+
+ build:
+ corddev:
+
+ head:
+ head1:
+ ansible_host: 10.90.0.252
+ ansible_port: 22
+ ansible_user: cord
+ ansible_ssh_pass: cord
+
+ compute:
\ No newline at end of file
diff --git a/podconfig/rcord-virtual-buildlocal.yml b/podconfig/rcord-virtual-buildlocal.yml
index 6d50078..ce606cd 100755
--- a/podconfig/rcord-virtual-buildlocal.yml
+++ b/podconfig/rcord-virtual-buildlocal.yml
@@ -27,6 +27,10 @@
prep_buildnode_prereqs:
- build-local-bootstrap
+vagrant_up_prereqs:
+ - prereqs-check
+ - ciab-ovs
+
# Override setting in scenarios/cord/config.yml with noop
docker_image_prereqs:
- prep-buildnode
diff --git a/podconfig/rcord-virtual.yml b/podconfig/rcord-virtual.yml
index b10d090..6e7e008 100644
--- a/podconfig/rcord-virtual.yml
+++ b/podconfig/rcord-virtual.yml
@@ -21,3 +21,6 @@
cord_scenario: cord
cord_profile: rcord
+vagrant_up_prereqs:
+ - prereqs-check
+ - ciab-ovs
\ No newline at end of file
diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index c2376e1..bce975e 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -59,16 +59,10 @@
management_include_names: eth1
management_exclude_names: eth0,eth2
-docker_opts: "{{ ('--insecure-registry ' ~ deploy_docker_registry) }}"
-
# make build config
build_targets:
- compute1-up
-vagrant_up_prereqs:
- - prereqs-check
- - ciab-ovs
-
cord_config_prereqs:
- copy-cord