From 7dd14e002128b5e6fe5302e6f7fe8620682a7d53 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Tue, 13 Mar 2018 10:30:16 +0000 Subject: xci: Merge configure-network and syncronize-time roles Those roles were too small and only used as part of the host bootstrapping process. As such, we merge them into a common 'bootstrap-host' role which can be used to prepare the hosts after the initial deployment Change-Id: Ifc84cf40b98ced91b31aae699dc28e9642380550 Signed-off-by: Markos Chandras --- xci/installer/osa/playbooks/configure-opnfvhost.yml | 6 ++---- xci/installer/osa/playbooks/configure-targethosts.yml | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'xci/installer/osa') 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" -- cgit 1.2.3-korg