xci: Make few of OpenStack-Ansible components optional

Ironic and Horizon are not quite needed for a functional deployment
and they are not currently required by functest so we can remove them
from the default deployment.

Change-Id: I171483f7b774951f84687529e98cb519afa48043
Signed-off-by: Markos Chandras <mchandras@suse.de>

diff --git a/xci/config/user-vars b/xci/config/user-vars
index 4912423..06e91cf 100755 (executable)
--- a/xci/config/user-vars
+++ b/xci/config/user-vars
@@ -45,5 +45,6 @@ export XCI_INSTALLER=${XCI_INSTALLER:-osa}
 #   XCI_ANSIBLE_VERBOSITY="-vvvv"
 export XCI_ANSIBLE_VERBOSITY=${XCI_ANSIBLE_VERBOSITY:-""}
 export RUN_TEMPEST=${RUN_TEMPEST:-false}
+export CORE_OPENSTACK_INSTALL=${CORE_OPENSTACK_INSTALL:-false}
 # Set this to to true to force XCI to re-create the target OS images
 export CLEAN_DIB_IMAGES=${CLEAN_DIB_IMAGES:-false}

diff --git a/xci/installer/osa/files/setup-openstack.yml b/xci/installer/osa/files/setup-openstack.yml
index c2cb1c7..544a999 100644 (file)
--- 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 4d75f11..deeab18 100644 (file)
--- 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/"

diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml
index 4120a9d..d3924bf 100644 (file)
--- a/xci/var/opnfv.yml
+++ b/xci/var/opnfv.yml
@@ -33,6 +33,7 @@ XCI_EXTRA_VARS_PATH: "{{ lookup('env', 'XCI_EXTRA_VARS_PATH') }}"
 XCI_SSL_SUBJECT: "{{ lookup('env', 'XCI_SSL_SUBJECT') }}"
 XCI_CEPH_ENABLED: "{{ lookup('env', 'XCI_CEPH_ENABLED') }}"
 RUN_TEMPEST: "{{ lookup('env', 'RUN_TEMPEST') }}"
+CORE_OPENSTACK_INSTALL: "{{ lookup('env', 'CORE_OPENSTACK_INSTALL') }}"
 DEPLOY_SCENARIO: "{{ lookup('env','DEPLOY_SCENARIO') }}"
 XCI_INSTALLER: "{{ lookup('env','XCI_INSTALLER') }}"
 KUBESPRAY_VERSION: "{{ lookup('env','KUBESPRAY_VERSION') }}"