diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-18 15:50:16 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-09-21 21:51:43 +0100 |
| commit | 3a281e5c91bf05d94361af1ff5818657d92a1bfd (patch) | |
| tree | fed51b08175c6de03cf3dec4db9c50515f8c2a7d | |
| parent | f2f978fd7a3346c0ba5323fdf22d8d105836ca44 (diff) | |
xci: playbooks: Include distribution var files dynamically
This is a continuation of I0a49e2ed8d811bb40a99612462752f8691133e0f
We need to convert these two plays to include the variable files
dynamically similar to the rest of the playbook.
Change-Id: I43203651ccafb03e015bfe4d1b075a7ee96b5adc
Signed-off-by: Markos Chandras <mchandras@suse.de>
| -rw-r--r-- | xci/playbooks/configure-localhost.yml | 2 | ||||
| -rw-r--r-- | xci/playbooks/configure-opnfvhost.yml | 1 | ||||
| -rw-r--r-- | xci/playbooks/provision-vm-nodes.yml | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml index aebde61e..915d1959 100644 --- a/xci/playbooks/configure-localhost.yml +++ b/xci/playbooks/configure-localhost.yml @@ -32,7 +32,6 @@ - { role: clone-repository, project: "openstack/openstack-ansible-openstack_openrc", repo: "{{ OPENSTACK_OSA_OPENRC_GIT_URL }}", dest: "{{ OPENSTACK_OSA_OPENRC_PATH }}", version: "master" } - hosts: localhost connection: local - gather_facts: false vars_files: - ../var/opnfv.yml tasks: @@ -77,7 +76,6 @@ dest: "{{OPNFV_RELENG_PATH}}/xci/var" - hosts: localhost connection: local - gather_facts: false vars_files: - ../var/opnfv.yml tasks: diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index 283aadcf..84c0d827 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -150,7 +150,6 @@ shell: "/bin/cat {{ ansible_env.HOME }}/.ssh/id_rsa.pub >> ../file/authorized_keys" - hosts: opnfv - gather_facts: no remote_user: root vars_files: - ../var/flavor-vars.yml diff --git a/xci/playbooks/provision-vm-nodes.yml b/xci/playbooks/provision-vm-nodes.yml index 3d88c5cb..81fc5755 100644 --- a/xci/playbooks/provision-vm-nodes.yml +++ b/xci/playbooks/provision-vm-nodes.yml @@ -83,9 +83,11 @@ connection: local become: yes vars_files: - - ../var/{{ ansible_os_family }}.yml - ../var/opnfv.yml tasks: + - name: Load distribution variables + include_vars: + file: ../var/{{ ansible_os_family }}.yml - name: destroy VM nodes created by previous deployment command: "/bin/bash ./scripts/destroy-env.sh" args: |