diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-12-12 14:03:42 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-12-14 08:49:44 +0000 |
| commit | ce92c66443ce7baa46f9d380c3f307d42f4881f0 (patch) | |
| tree | 2ebed4724ca1708aae3d4bfb3f3a61f8546d2237 /xci/playbooks | |
| parent | b2dfffae695ea299ac5f11e48f99068390bcc671 (diff) | |
xci: Drop AIO specific playbook
The configure-opnfvhost playbook which is used for all flavors except
AIO can also be used for AIO if it's adapted to not configure networking
on the host and also do not fail if there aren't any OSA variables files
available so lets do all that in order to avoid duplicating code across
flavors.
Change-Id: I58379d8b52094294b9349494753ffcdd44982013
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/playbooks')
| -rw-r--r-- | xci/playbooks/configure-opnfvhost.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index 0ceacc02..30831bec 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -26,6 +26,7 @@ roles: - role: configure-network + when: XCI_FLAVOR != "aio" tasks: - name: generate SSH keys @@ -49,8 +50,10 @@ shell: "/bin/cp -rf {{OPENSTACK_OSA_PATH}}/etc/openstack_deploy {{OPENSTACK_OSA_ETC_PATH}}" - name: copy openstack_user_config.yml shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/openstack_user_config.yml {{OPENSTACK_OSA_ETC_PATH}}" + failed_when: false - name: copy all user override files shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_variables.yml {{OPENSTACK_OSA_ETC_PATH}}" + failed_when: false - name: copy cinder.yml shell: "/bin/cp -rf {{ remote_xci_path }}/xci/file/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d" - name: Configure AIO tempest @@ -159,6 +162,7 @@ - name: Load distribution variables include_vars: file: "{{ item }}" + failed_when: false with_items: - ../var/opnfv.yml - ../var/{{ ansible_os_family }}.yml |