diff options
| -rw-r--r-- | xci/playbooks/configure-localhost.yml | 17 | ||||
| -rw-r--r-- | xci/playbooks/configure-opnfvhost.yml | 19 | ||||
| -rw-r--r-- | xci/playbooks/configure-targethosts.yml | 10 | ||||
| -rw-r--r-- | xci/playbooks/provision-vm-nodes.yml | 18 |
4 files changed, 49 insertions, 15 deletions
diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml index 2dfa0530..10dd6946 100644 --- a/xci/playbooks/configure-localhost.yml +++ b/xci/playbooks/configure-localhost.yml @@ -10,8 +10,11 @@ - hosts: localhost connection: local vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/opnfv.yml + pre_tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml roles: - role: remove-folders - { role: clone-repository, project: "opnfv/releng-xci", repo: "{{ OPNFV_RELENG_GIT_URL }}", dest: "{{ OPNFV_RELENG_PATH }}", version: "{{ OPNFV_RELENG_VERSION }}" } @@ -20,9 +23,11 @@ connection: local gather_facts: false vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/opnfv.yml tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml - name: Synchronize local development releng-xci repository to XCI paths synchronize: src: "{{ OPNFV_RELENG_DEV_PATH }}" @@ -35,9 +40,11 @@ - hosts: localhost connection: local vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/opnfv.yml tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml - name: create log directory {{LOG_PATH}} file: path: "{{LOG_PATH}}" @@ -61,9 +68,11 @@ connection: local gather_facts: false vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/opnfv.yml tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml - name: create certificate directory /etc/ssl/certs file: path: "/etc/ssl/certs" diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index 5beddcd7..da478255 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -10,9 +10,12 @@ - hosts: opnfv remote_user: root vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/flavor-vars.yml - ../var/opnfv.yml + pre_tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml roles: - role: remove-folders - { role: clone-repository, project: "opnfv/releng-xci", repo: "{{ OPNFV_RELENG_GIT_URL }}", dest: "{{ OPNFV_RELENG_PATH }}", version: "{{ OPNFV_RELENG_VERSION }}" } @@ -21,9 +24,11 @@ - hosts: opnfv remote_user: root vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/opnfv.yml tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml - name: Synchronize local development releng-xci repository to XCI paths synchronize: src: "{{ OPNFV_RELENG_DEV_PATH }}" @@ -44,9 +49,12 @@ - hosts: opnfv remote_user: root vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/flavor-vars.yml - ../var/opnfv.yml + pre_tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml roles: - role: configure-network tasks: @@ -133,10 +141,13 @@ gather_facts: no remote_user: root vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/flavor-vars.yml - ../var/opnfv.yml - "{{ XCI_FLAVOR_ANSIBLE_FILE_PATH }}/user_variables.yml" + pre_tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml roles: - role: "openstack-ansible-openstack_openrc" tasks: diff --git a/xci/playbooks/configure-targethosts.yml b/xci/playbooks/configure-targethosts.yml index 88da1312..0b3bf348 100644 --- a/xci/playbooks/configure-targethosts.yml +++ b/xci/playbooks/configure-targethosts.yml @@ -10,8 +10,11 @@ - hosts: controller remote_user: root vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/flavor-vars.yml + pre_tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml roles: - role: configure-network # we need to force sync time with ntp or the nodes will be out of sync timewise @@ -20,8 +23,11 @@ - hosts: compute remote_user: root vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/flavor-vars.yml + pre_tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml roles: - role: configure-network # we need to force sync time with ntp or the nodes will be out of sync timewise diff --git a/xci/playbooks/provision-vm-nodes.yml b/xci/playbooks/provision-vm-nodes.yml index e9b8fa2d..5e897e17 100644 --- a/xci/playbooks/provision-vm-nodes.yml +++ b/xci/playbooks/provision-vm-nodes.yml @@ -9,9 +9,13 @@ ############################################################################## - hosts: localhost connection: local + gather_facts: true vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/opnfv.yml + pre_tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml roles: # using these roles here ensures that we can reuse this playbook in different context - role: remove-folders @@ -20,11 +24,13 @@ - hosts: localhost connection: local - gather_facts: false + gather_facts: true vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/opnfv.yml tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml - name: Synchronize local development bifrost repository to XCI paths # command module is much faster than the copy module synchronize: @@ -54,11 +60,13 @@ - hosts: localhost connection: local - gather_facts: false + gather_facts: true vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/opnfv.yml tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml - name: combine opnfv/releng-xci and openstack/bifrost scripts/playbooks copy: src: "{{ OPNFV_RELENG_PATH }}/bifrost/" |