Move CiaB-specific config out of 'cord' scenario.
These config settings are necessary for CiaB, but should not be set for a physical
install, so should not be part of the defaults of the 'cord' scenario.
Change-Id: I9ccbc345cb9f45e7bcb5df2c3eb9497d91d68d82
(cherry picked from commit a41bca50c587e39dc10275280aaa5104f81953e4)
diff --git a/podconfig/rcord-physical.yml b/podconfig/rcord-physical.yml
index af602dc..dba8023 100644
--- a/podconfig/rcord-physical.yml
+++ b/podconfig/rcord-physical.yml
@@ -46,9 +46,6 @@
# 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'
diff --git a/podconfig/rcord-virtual-buildlocal.yml b/podconfig/rcord-virtual-buildlocal.yml
index ce606cd..cb0e1bd 100755
--- a/podconfig/rcord-virtual-buildlocal.yml
+++ b/podconfig/rcord-virtual-buildlocal.yml
@@ -37,6 +37,25 @@
deploy_docker_registry: "10.100.198.201:5000"
+external_iface: 'eth0'
+
+build_targets:
+ - compute1-up
+
+skipTags:
+ - 'set_compute_node_password'
+ - 'switch_support'
+ - 'reboot'
+ - 'interface_config'
+
+# Other old config carried over
+cord_in_a_box: True # what is this for?
+fabric_include_names: eth2
+fabric_include_module_types: omit
+fabric_exclude_names: eth0,eth1
+management_include_names: eth1
+management_exclude_names: eth0,eth2
+
inventory_groups:
config:
diff --git a/podconfig/rcord-virtual.yml b/podconfig/rcord-virtual.yml
index 6e7e008..bf826f0 100644
--- a/podconfig/rcord-virtual.yml
+++ b/podconfig/rcord-virtual.yml
@@ -23,4 +23,23 @@
vagrant_up_prereqs:
- prereqs-check
- - ciab-ovs
\ No newline at end of file
+ - ciab-ovs
+
+build_targets:
+ - compute1-up
+
+external_iface: 'eth0'
+
+skipTags:
+ - 'set_compute_node_password'
+ - 'switch_support'
+ - 'reboot'
+ - 'interface_config'
+
+# Other old config carried over
+cord_in_a_box: True # what is this for?
+fabric_include_names: eth2
+fabric_include_module_types: omit
+fabric_exclude_names: eth0,eth1
+management_include_names: eth1
+management_exclude_names: eth0,eth2
\ No newline at end of file
diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index b58187e..ba4fa6f 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -42,26 +42,11 @@
# Variables required by MAAS
fabric_ip: '10.6.1.1/24'
management_ip: '10.1.0.1/24'
-external_iface: 'eth0'
management_network: '10.1.0.0/24'
-#ansible_ssh_user: "vagrant" # wtf
-
-# Other old config carried over
-skipTags:
- - 'set_compute_node_password'
- - 'switch_support'
- - 'reboot'
- - 'interface_config'
-cord_in_a_box: True # what is this for?
-fabric_include_names: eth2
-fabric_include_module_types: omit
-fabric_exclude_names: eth0,eth1
-management_include_names: eth1
-management_exclude_names: eth0,eth2
# make build config
build_targets:
- - compute1-up
+ - setup-automation
cord_config_prereqs:
- copy-cord