diff options
| -rw-r--r-- | xci/file/aio/configure-opnfvhost.yml | 4 | ||||
| -rw-r--r-- | xci/playbooks/configure-opnfvhost.yml | 8 | ||||
| -rw-r--r-- | xci/var/opnfv.yml | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/xci/file/aio/configure-opnfvhost.yml b/xci/file/aio/configure-opnfvhost.yml index 6b140c15..907e87de 100644 --- a/xci/file/aio/configure-opnfvhost.yml +++ b/xci/file/aio/configure-opnfvhost.yml @@ -18,11 +18,11 @@ command: "/bin/bash ./scripts/bootstrap-ansible.sh" args: chdir: "{{OPENSTACK_OSA_PATH}}" - - name: Disable AIO tempest + - name: Configure AIO tempest lineinfile: path: "{{ OPENSTACK_OSA_PATH }}/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2" regexp: "^{{ item }}.*" - line: "{{ item }}: false" + line: "{{ item }}: {{ RUN_TEMPEST | bool }}" state: present with_items: - "tempest_install" diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index 12fb3a0f..fdf21786 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -79,6 +79,14 @@ shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/user_variables.yml {{OPENSTACK_OSA_ETC_PATH}}" - name: copy cinder.yml shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d" + - name: Configure AIO tempest + lineinfile: + path: "{{ OPENSTACK_OSA_ETC_PATH }}/user_variables.yml" + line: "{{ item }}: {{ RUN_TEMPEST | bool }}" + state: present + with_items: + - "tempest_install" + - "tempest_run" - block: - name: copy ceph.yml shell: "/bin/cp -rf {{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/ceph.yml {{OPENSTACK_OSA_ETC_PATH}}/conf.d/" diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml index 7dd9b46c..0cca1170 100644 --- a/xci/var/opnfv.yml +++ b/xci/var/opnfv.yml @@ -33,6 +33,7 @@ OPNFV_SSH_HOST_KEYS_PATH: "{{ lookup('env', 'OPNFV_SSH_HOST_KEYS_PATH') }}" 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') }}" # install docker on opnfv host only if we are running as part of CI opnfv_required_packages: |