summaryrefslogtreecommitdiffstats
path: root/xci/nfvi/osa/playbooks
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-01-03 09:50:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-03 09:50:55 +0000
commit105e4a455a5ef2c9add0a60f059c0e6fe04eba0f (patch)
treeea56481f54f138ab11027a05d97bdc1fad6eeedf /xci/nfvi/osa/playbooks
parentab9fb8bed590af37cba92cf5b0517fd6fdc04674 (diff)
parentb7c67c901075fc44a087f38e6b11fdac0b1d04d8 (diff)
Merge "[XCI] move osa files into xci/nfvi/osa/files"
Diffstat (limited to 'xci/nfvi/osa/playbooks')
-rw-r--r--xci/nfvi/osa/playbooks/configure-opnfvhost.yml12
-rw-r--r--xci/nfvi/osa/playbooks/configure-targethosts.yml6
2 files changed, 9 insertions, 9 deletions
diff --git a/xci/nfvi/osa/playbooks/configure-opnfvhost.yml b/xci/nfvi/osa/playbooks/configure-opnfvhost.yml
index 656f18e8..7f0e43f9 100644
--- a/xci/nfvi/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/nfvi/osa/playbooks/configure-opnfvhost.yml
@@ -18,11 +18,11 @@
file: "{{ item }}"
with_items:
- "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml"
- - "{{ XCI_PATH }}/xci/file/{{ XCI_FLAVOR }}/flavor-vars.yml"
+ - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml"
- name: Set facts for remote deployment
set_fact:
remote_xci_path: "{{ ansible_env.HOME }}/releng-xci"
- remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/file/{{ XCI_FLAVOR }}"
+ remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/nfvi/{{XCI_NFVI}}/files/{{ XCI_FLAVOR }}"
remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks"
roles:
@@ -37,7 +37,7 @@
- name: fetch public key
fetch:
src: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub"
- dest: "{{ XCI_PATH }}/xci/file/authorized_keys"
+ dest: "{{ XCI_PATH }}/xci/files/authorized_keys"
flat: yes
- name: Copy releng-xci to remote host
synchronize:
@@ -152,7 +152,7 @@
tasks:
- name: Append public keys to authorized_keys
- shell: "/bin/cat {{ ansible_env.HOME }}/.ssh/id_rsa.pub >> {{ XCI_PATH }}/xci/file/authorized_keys"
+ shell: "/bin/cat {{ ansible_env.HOME }}/.ssh/id_rsa.pub >> {{ XCI_PATH }}/xci/files/authorized_keys"
- hosts: opnfv
remote_user: root
@@ -166,8 +166,8 @@
failed_when: false
with_items:
- "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml"
- - "{{ XCI_PATH }}/xci/file/{{ XCI_FLAVOR }}/flavor-vars.yml"
- - "{{ XCI_PATH }}/xci/file/{{ XCI_FLAVOR }}/user_variables.yml"
+ - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml"
+ - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/user_variables.yml"
roles:
- role: "openstack-ansible-openstack_openrc"
diff --git a/xci/nfvi/osa/playbooks/configure-targethosts.yml b/xci/nfvi/osa/playbooks/configure-targethosts.yml
index 14a9149b..fb43a920 100644
--- a/xci/nfvi/osa/playbooks/configure-targethosts.yml
+++ b/xci/nfvi/osa/playbooks/configure-targethosts.yml
@@ -4,7 +4,7 @@
tasks:
- name: add public key to host
copy:
- src: "{{ XCI_PATH }}/xci/file/authorized_keys"
+ src: "{{ XCI_PATH }}/xci/files/authorized_keys"
dest: /root/.ssh/authorized_keys
- hosts: controller
@@ -18,7 +18,7 @@
file: "{{ item }}"
with_items:
- "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml"
- - "{{ XCI_PATH }}/xci/file/{{ XCI_FLAVOR }}/flavor-vars.yml"
+ - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml"
roles:
- role: configure-network
# we need to force sync time with ntp or the nodes will be out of sync timewise
@@ -35,7 +35,7 @@
file: "{{ item }}"
with_items:
- "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.yml"
- - "{{ XCI_PATH }}/xci/file/{{ XCI_FLAVOR }}/flavor-vars.yml"
+ - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/flavor-vars.yml"
roles:
- role: configure-network
# we need to force sync time with ntp or the nodes will be out of sync timewise