CORD-1151
Make cord_dir and cord_profile_dir local to config node
use head_* and config_* prefixes to avoid hardcoding paths
config-side ssh key generation+
fix frontend & mock builds
[build] group in inventory
fix inventory strangeness
raise privs when creating ssh_pki_dir
move admin-openrc.sh.j2 to cord-profile
add copy-cord-playbook.yml, clarify where it runs
fix paths for head_cord_profile_dir with mock/frontend
use /opt/cord_profile/admin-openrc.sh rather than ~/admin-openrc.sh
install pki
make comment in do-enlist-compute-node accurate, set correct interface
remove hardcoded credential path
logging and ssh key fixes
Change-Id: Ie7560c911dce1558e09806c9997884dfbd475e9c
diff --git a/roles/xos-core-build/defaults/main.yml b/roles/xos-core-build/defaults/main.yml
index e6d6c26..2772a14 100644
--- a/roles/xos-core-build/defaults/main.yml
+++ b/roles/xos-core-build/defaults/main.yml
@@ -1,7 +1,8 @@
---
+# xos-core-build/defaults/main.yml
-cord_dir: "{{ playbook_dir + '/../..' }}"
-build_docker_tag: candidate
+build_cord_dir: "{{ playbook_dir ~ '/../..' }}"
+build_docker_tag: "candidate"
deploy_docker_registry: "localhost:5000"
deploy_docker_tag: "candidate"
@@ -12,3 +13,4 @@
profile_library: ""
xos_services: []
+
diff --git a/roles/xos-core-build/tasks/main.yml b/roles/xos-core-build/tasks/main.yml
index 88e6af6..06faff1 100644
--- a/roles/xos-core-build/tasks/main.yml
+++ b/roles/xos-core-build/tasks/main.yml
@@ -30,7 +30,7 @@
- name: Create the BUILD directory
file:
- path: "{{ cord_dir | realpath }}/orchestration/xos/containers/xos/BUILD"
+ path: "{{ build_cord_dir | realpath }}/orchestration/xos/containers/xos/BUILD"
state: directory
mode: 0755
@@ -41,9 +41,9 @@
shell: >
docker run
--rm
- -v {{ cord_dir | realpath }}:/opt/cord
- -v {{ cord_dir | realpath }}/orchestration/xos/containers/xos/BUILD:/opt/xos_corebuilder/BUILD
- xosproject/xos-corebuilder:candidate
+ -v {{ build_cord_dir | realpath }}:/opt/cord
+ -v {{ build_cord_dir ~ "/orchestration/xos/containers/xos/BUILD" | realpath }}:/opt/xos_corebuilder/BUILD
+ xosproject/xos-corebuilder:{{ build_docker_tag }}
{{ recipes_string }}
tags:
- skip_ansible_lint # running a build task
@@ -51,7 +51,7 @@
- name: Build UI image
docker_image:
name: "xosproject/xos-ui"
- path: "{{ cord_dir | realpath }}/orchestration/xos"
+ path: "{{ build_cord_dir | realpath }}/orchestration/xos"
tag: "{{ build_docker_tag }}"
dockerfile: "containers/xos/Dockerfile.UI"
pull: False