From: Markos Chandras Date: Tue, 13 Mar 2018 10:30:16 +0000 (+0000) Subject: xci: Merge configure-network and syncronize-time roles X-Git-Tag: 6.0.0~112^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7dd14e002128b5e6fe5302e6f7fe8620682a7d53;p=releng-xci.git 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 --- 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" diff --git a/xci/playbooks/roles/.gitignore b/xci/playbooks/roles/.gitignore index e0b47770..296233e0 100644 --- a/xci/playbooks/roles/.gitignore +++ b/xci/playbooks/roles/.gitignore @@ -1,8 +1,7 @@ * !.gitignore !clone-repository/ -!configure-network/ +!bootstrap-host/ !configure-nfs/ !prepare-functest/ !remote-folders/ -!synchronize-time/ diff --git a/xci/playbooks/roles/bootstrap-host/defaults/main.yml b/xci/playbooks/roles/bootstrap-host/defaults/main.yml new file mode 100644 index 00000000..8e5a0e34 --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/defaults/main.yml @@ -0,0 +1,11 @@ +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 SUSE Linux GmbH and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +configure_network: yes +configure_time: yes diff --git a/xci/playbooks/roles/configure-network/files/network-config-suse b/xci/playbooks/roles/bootstrap-host/files/network-config-suse similarity index 100% rename from xci/playbooks/roles/configure-network/files/network-config-suse rename to xci/playbooks/roles/bootstrap-host/files/network-config-suse diff --git a/xci/playbooks/roles/bootstrap-host/tasks/main.yml b/xci/playbooks/roles/bootstrap-host/tasks/main.yml new file mode 100644 index 00000000..7d6d259e --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/tasks/main.yml @@ -0,0 +1,15 @@ +--- +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 SUSE Linx GmbH and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- include: network.yml + when: configure_network + +- include: time.yml + when: configure_time diff --git a/xci/playbooks/roles/configure-network/tasks/main.yml b/xci/playbooks/roles/bootstrap-host/tasks/network.yml similarity index 100% rename from xci/playbooks/roles/configure-network/tasks/main.yml rename to xci/playbooks/roles/bootstrap-host/tasks/network.yml diff --git a/xci/playbooks/roles/synchronize-time/tasks/main.yml b/xci/playbooks/roles/bootstrap-host/tasks/time.yml similarity index 100% rename from xci/playbooks/roles/synchronize-time/tasks/main.yml rename to xci/playbooks/roles/bootstrap-host/tasks/time.yml diff --git a/xci/playbooks/roles/configure-network/templates/debian/compute00.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/compute00.interface.j2 similarity index 100% rename from xci/playbooks/roles/configure-network/templates/debian/compute00.interface.j2 rename to xci/playbooks/roles/bootstrap-host/templates/debian/compute00.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/debian/compute01.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/compute01.interface.j2 similarity index 100% rename from xci/playbooks/roles/configure-network/templates/debian/compute01.interface.j2 rename to xci/playbooks/roles/bootstrap-host/templates/debian/compute01.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/controller00.interface.j2 similarity index 100% rename from xci/playbooks/roles/configure-network/templates/debian/controller00.interface.j2 rename to xci/playbooks/roles/bootstrap-host/templates/debian/controller00.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/debian/controller01.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/controller01.interface.j2 similarity index 100% rename from xci/playbooks/roles/configure-network/templates/debian/controller01.interface.j2 rename to xci/playbooks/roles/bootstrap-host/templates/debian/controller01.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/debian/controller02.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/controller02.interface.j2 similarity index 100% rename from xci/playbooks/roles/configure-network/templates/debian/controller02.interface.j2 rename to xci/playbooks/roles/bootstrap-host/templates/debian/controller02.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/debian/opnfv.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/debian/opnfv.interface.j2 similarity index 100% rename from xci/playbooks/roles/configure-network/templates/debian/opnfv.interface.j2 rename to xci/playbooks/roles/bootstrap-host/templates/debian/opnfv.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/redhat/bridge.ifcfg.j2 b/xci/playbooks/roles/bootstrap-host/templates/redhat/bridge.ifcfg.j2 similarity index 100% rename from xci/playbooks/roles/configure-network/templates/redhat/bridge.ifcfg.j2 rename to xci/playbooks/roles/bootstrap-host/templates/redhat/bridge.ifcfg.j2 diff --git a/xci/playbooks/roles/configure-network/templates/redhat/interface.ifcfg.j2 b/xci/playbooks/roles/bootstrap-host/templates/redhat/interface.ifcfg.j2 similarity index 100% rename from xci/playbooks/roles/configure-network/templates/redhat/interface.ifcfg.j2 rename to xci/playbooks/roles/bootstrap-host/templates/redhat/interface.ifcfg.j2 diff --git a/xci/playbooks/roles/configure-network/templates/suse/suse.interface.j2 b/xci/playbooks/roles/bootstrap-host/templates/suse/suse.interface.j2 similarity index 100% rename from xci/playbooks/roles/configure-network/templates/suse/suse.interface.j2 rename to xci/playbooks/roles/bootstrap-host/templates/suse/suse.interface.j2 diff --git a/xci/playbooks/roles/configure-network/templates/suse/suse.routes.j2 b/xci/playbooks/roles/bootstrap-host/templates/suse/suse.routes.j2 similarity index 100% rename from xci/playbooks/roles/configure-network/templates/suse/suse.routes.j2 rename to xci/playbooks/roles/bootstrap-host/templates/suse/suse.routes.j2