diff options
Diffstat (limited to 'xci/installer')
| -rw-r--r-- | xci/installer/osa/files/setup-openstack.yml | 2 | ||||
| -rw-r--r-- | xci/installer/osa/playbooks/configure-opnfvhost.yml | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/xci/installer/osa/files/setup-openstack.yml b/xci/installer/osa/files/setup-openstack.yml index c2cb1c79..544a9999 100644 --- a/xci/installer/osa/files/setup-openstack.yml +++ b/xci/installer/osa/files/setup-openstack.yml @@ -20,8 +20,10 @@ - include: os-neutron-install.yml - include: os-heat-install.yml - include: os-horizon-install.yml + when: not core_openstack | default(False) - include: os-swift-install.yml - include: os-ironic-install.yml + when: not core_openstack | default(False) - include: os-tacker-install.yml - include: os-tempest-install.yml when: (tempest_install | default(False)) | bool or (tempest_run | default(False)) | bool diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml index 4d75f115..deeab182 100644 --- a/xci/installer/osa/playbooks/configure-opnfvhost.yml +++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml @@ -59,14 +59,15 @@ failed_when: false - name: copy cinder.yml shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d" - - name: Configure AIO tempest + - name: Configure OpenStack-Ansible components lineinfile: path: "{{ OPENSTACK_OSA_ETC_PATH }}/user_variables.yml" - line: "{{ item }}: {{ RUN_TEMPEST | bool }}" + line: "{{ item.component }}: {{ item.value }}" state: present with_items: - - "tempest_install" - - "tempest_run" + - { component: "tempest_install", value: "{{ RUN_TEMPEST | bool }}" } + - { component: "tempest_run", value: "{{ RUN_TEMPEST | bool }}" } + - { component: "core_openstack", value: "{{ CORE_OPENSTACK_INSTALL | bool }}" } - block: - name: copy ceph.yml shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/ceph.yml {{OPENSTACK_OSA_ETC_PATH}}/conf.d/" |