summaryrefslogtreecommitdiffstats
path: root/xci/installer/osa/playbooks
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-03-14 08:01:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-14 08:01:27 +0000
commit990f97e9ebf417dd18e533cbbfec8977fe59f39a (patch)
treee2324d7e8b58f2588c3abda8bf03b48383a3c654 /xci/installer/osa/playbooks
parent2c11cf6509eafafe80fa50657417b19a4458915e (diff)
parent7dd14e002128b5e6fe5302e6f7fe8620682a7d53 (diff)
Merge "xci: Merge configure-network and syncronize-time roles"
Diffstat (limited to 'xci/installer/osa/playbooks')
-rw-r--r--xci/installer/osa/playbooks/configure-opnfvhost.yml6
-rw-r--r--xci/installer/osa/playbooks/configure-targethosts.yml8
2 files changed, 4 insertions, 10 deletions
diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index a3b8894f..8b596b3c 100644
--- a/xci/installer/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml
@@ -27,10 +27,8 @@
remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks"
roles:
- - role: configure-network
- when: XCI_FLAVOR != "aio"
- # we need to force sync time with ntp or the nodes will be out of sync timewise
- - role: synchronize-time
+ - role: bootstrap-host
+ configure_network: XCI_FLAVOR != 'aio'
tasks:
- name: generate SSH keys
diff --git a/xci/installer/osa/playbooks/configure-targethosts.yml b/xci/installer/osa/playbooks/configure-targethosts.yml
index fb43a920..4341a884 100644
--- a/xci/installer/osa/playbooks/configure-targethosts.yml
+++ b/xci/installer/osa/playbooks/configure-targethosts.yml
@@ -20,9 +20,7 @@
- "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.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
- - role: synchronize-time
+ - role: bootstrap-host
- hosts: compute
remote_user: root
@@ -37,9 +35,7 @@
- "{{ XCI_PATH }}/xci/var/{{ ansible_os_family }}.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
- - role: synchronize-time
+ - role: bootstrap-host
- role: configure-ceph
when: XCI_CEPH_ENABLED == "true"