CORD-1151
remove variables set in platform-install by profile_manifest
generate config on build node
reorder build slightly
Change-Id: I6dadebda073a98e1b74420fc13ad7dd683dfc343
diff --git a/config/cord_in_a_box.yml b/config/cord_in_a_box.yml
index f3ce426..b93d496 100644
--- a/config/cord_in_a_box.yml
+++ b/config/cord_in_a_box.yml
@@ -18,13 +18,14 @@
# set to the "flavor" of cord you want to install
cord_profile: 'rcord'
- # set paths to appropriate values
- cord_dir: '/opt/cord'
- cord_profile_dir: '/opt/cord_profile'
+ # cord dir is shared to corddev VM, may need redirection to work
credentials_dir: '/opt/credentials'
pki_dir: '/opt/pki'
ssh_pki_dir: '/opt/ssh_pki'
+ # for cord in a box, config = build, so set config_cord_dir to /opt/cord
+ config_cord_dir: '/cord'
+
# Specifies tasks within the head node provisioning not to execute, including:
#
# switch_support - don't download the switch ONL images as there are no
diff --git a/config/default.yml b/config/default.yml
index 3799407..ade946a 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -17,9 +17,7 @@
# set to the profile of cord you want to install
cord_profile: 'rcord'
- # directories on the head node that the cord dir is copied to, and profile is created in
- cord_dir: '/opt/cord'
- cord_profile_dir: '/opt/cord_profile'
+ # cord dir is shared to corddev VM, causing permissions issues if these aren't set
credentials_dir: '/opt/credentials'
pki_dir: '/opt/pki'
ssh_pki_dir: '/opt/ssh_pki'
diff --git a/config/ecord_global_in_a_box.yml b/config/ecord_global_in_a_box.yml
index 1956c67..6c8478c 100644
--- a/config/ecord_global_in_a_box.yml
+++ b/config/ecord_global_in_a_box.yml
@@ -17,8 +17,6 @@
# set to the "flavor" of cord you want to install
cord_profile: 'ecord-global'
- cord_dir: '/opt/cord'
- cord_profile_dir: '/opt/cord_profile'
# Specifies tasks within the head node provisioning not to execute, including:
#
diff --git a/config/ecord_in_a_box.yml b/config/ecord_in_a_box.yml
index 827ff04..9c5f50e 100644
--- a/config/ecord_in_a_box.yml
+++ b/config/ecord_in_a_box.yml
@@ -17,8 +17,6 @@
# set to the "flavor" of cord you want to install
cord_profile: 'ecord'
- cord_dir: '/opt/cord'
- cord_profile_dir: '/opt/cord_profile'
# Specifies tasks within the head node provisioning not to execute, including:
#
diff --git a/config/onlab_develop_pod.yml b/config/onlab_develop_pod.yml
index 6f3ce06..7e97199 100644
--- a/config/onlab_develop_pod.yml
+++ b/config/onlab_develop_pod.yml
@@ -13,9 +13,7 @@
# set to the profile of cord you want to install
cord_profile: 'rcord'
- # directories on the head node that the cord dir is copied to, and profile is created in
- cord_dir: '/opt/cord'
- cord_profile_dir: '/opt/cord_profile'
+ # cord dir is shared to corddev VM, causing permissions issues if these aren't set
credentials_dir: '/opt/credentials'
pki_dir: '/opt/pki'
ssh_pki_dir: '/opt/ssh_pki'
diff --git a/config/sample.yml b/config/sample.yml
index 4a5adbc..0e37ebe 100644
--- a/config/sample.yml
+++ b/config/sample.yml
@@ -11,9 +11,7 @@
# set to the profile of cord you want to install
cord_profile: 'rcord'
- # directories on the head node that the cord dir is copied to, and profile is created in
- cord_dir: '/opt/cord'
- cord_profile_dir: '/opt/cord_profile'
+ # cord dir is shared to corddev VM, causing permissions issues if these aren't set
credentials_dir: '/opt/credentials'
pki_dir: '/opt/pki'
ssh_pki_dir: '/opt/ssh_pki'