Set directory paths used with dedicated build node
Change-Id: Ie1b6301e5cd788504d792af387c976339ce17f13
diff --git a/build.gradle b/build.gradle
index 7548ff7..861e94c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -232,10 +232,14 @@
}
task PIdeployOpenStack (type: Exec) {
- def ansible_cmd = "cd $config.common.cord_dir/build/platform-install; ansible-playbook -i inventory/head-localhost --extra-vars @$config.common.cord_dir/build/genconfig/config.yml deploy-openstack-playbook.yml"
- executable = "ssh"
- args = ["-p", "$config.headnode.ansible_ssh_port", "$config.headnode.ansible_user@$config.headnode.ip", ansible_cmd ]
+ workingDir "platform-install"
+ executable = "ansible-playbook"
+ args = [ "-i", "../genconfig/cord-inv",
+ "--extra-vars", "@../genconfig/config.yml",
+ "--extra-vars", "deploy_docker_tag="+targetTag,
+ "--extra-vars", "deploy_docker_registry=docker-registry:5000/",
+ "deploy-openstack-playbook.yml" ]
}
task PIdeployONOS (type: Exec) {
diff --git a/config/cord_in_a_box.yml b/config/cord_in_a_box.yml
index 27b92cb..f3ce426 100644
--- a/config/cord_in_a_box.yml
+++ b/config/cord_in_a_box.yml
@@ -17,8 +17,13 @@
# 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'
+ credentials_dir: '/opt/credentials'
+ pki_dir: '/opt/pki'
+ ssh_pki_dir: '/opt/ssh_pki'
# Specifies tasks within the head node provisioning not to execute, including:
#
diff --git a/config/default.yml b/config/default.yml
index 9489ac7..3799407 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -20,6 +20,9 @@
# 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'
+ credentials_dir: '/opt/credentials'
+ pki_dir: '/opt/pki'
+ ssh_pki_dir: '/opt/ssh_pki'
# 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 dfda974..6f3ce06 100644
--- a/config/onlab_develop_pod.yml
+++ b/config/onlab_develop_pod.yml
@@ -16,7 +16,9 @@
# 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'
-
+ credentials_dir: '/opt/credentials'
+ pki_dir: '/opt/pki'
+ ssh_pki_dir: '/opt/ssh_pki'
# all of these are written to genconfig/config.yml, and needs a rework
diff --git a/config/sample.yml b/config/sample.yml
index bf3d680..4a5adbc 100644
--- a/config/sample.yml
+++ b/config/sample.yml
@@ -14,6 +14,9 @@
# 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'
+ credentials_dir: '/opt/credentials'
+ pki_dir: '/opt/pki'
+ ssh_pki_dir: '/opt/ssh_pki'
# Network address information for the head node:
#