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/platform-check/defaults/main.yml b/roles/platform-check/defaults/main.yml
index 16a8ef7..4e19128 100644
--- a/roles/platform-check/defaults/main.yml
+++ b/roles/platform-check/defaults/main.yml
@@ -1,8 +1,8 @@
---
# platform-check/defaults/main.yml
-onos_cord_dest: "{{ ansible_user_dir }}/onos-cord/"
-cord_profile_dir: "{{ ansible_user_dir + '/cord_profile' }}"
+config_cord_profile_dir: "{{ ansible_user_dir + '/cord_profile' }}"
+head_onos_cord_dir: "/opt/onos-cord/"
xos_ui_port: 9000
diff --git a/roles/platform-check/tasks/main.yml b/roles/platform-check/tasks/main.yml
index a67e837..bd9347e 100644
--- a/roles/platform-check/tasks/main.yml
+++ b/roles/platform-check/tasks/main.yml
@@ -16,7 +16,7 @@
when: result | failed
shell: docker-compose stop; docker-compose rm -f; docker-compose up -d
args:
- chdir: "{{ onos_cord_dest }}"
+ chdir: "{{ head_onos_cord_dir }}"
tags:
- skip_ansible_lint
@@ -26,7 +26,7 @@
url: "http://xos.{{ site_suffix }}:{{ xos_ui_port }}/api/utility/tosca/run/"
user: "{{ xos_admin_user }}"
password: "{{ xos_admin_pass }}"
- recipe: "{{ lookup('file', cord_profile_dir + '/' + item ) }}"
+ recipe: "{{ lookup('file', head_cord_profile_dir + '/' + item ) }}"
with_items:
- openstack.yaml
- openstack-compute.yaml
@@ -42,7 +42,7 @@
url: "http://xos.{{ site_suffix }}:{{ xos_ui_port }}/api/utility/tosca/run/"
user: "{{ xos_admin_user }}"
password: "{{ xos_admin_pass }}"
- recipe: "{{ lookup('file', cord_profile_dir + '/' + item ) }}"
+ recipe: "{{ lookup('file', head_cord_profile_dir + '/' + item ) }}"
with_items:
- openstack-compute-vtn.yaml