| commit | 598f0bc9b0ba9a606360eff1036d0b0224e544c0 | [log] [tgz] |
|---|---|---|
| author | Oleksii Butenko <obutenko@mirantis.com> | Thu Oct 25 09:41:41 2018 +0300 |
| committer | Oleksii Butenko <obutenko@mirantis.com> | Fri Oct 26 12:01:43 2018 +0000 |
| tree | f3fa5240196053c8929d63495e3d4297c411c303 | |
| parent | 905ec697ab9943720ff2ee86d554db58205081cc [diff] |
fix for cookied-mcp-queens-dvr-ssl Change-Id: Ie079428864923dafb130354167e295dbfc2e3f71
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml index b5ef814..28fe394 100644 --- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml +++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
@@ -205,7 +205,7 @@ openstack_internal_protocol: 'https' tenant_telemetry_enabled: 'True' gnocchi_aggregation_storage: file - manila_enabled: 'True' + manila_enabled: 'False' manila_share_backend: 'lvm' manila_lvm_volume_name: 'manila-volume' manila_lvm_devices: '/dev/vdc'
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-environment.yaml index 92618bc..cc6140a 100644 --- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-environment.yaml +++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-environment.yaml
@@ -196,36 +196,3 @@ role: bond0_ab_ovs_vxlan_mesh ens6: role: bond1_ab_ovs_floating - - share01.mcp-queens-dvr-ssl.local: - reclass_storage_name: openstack_share_node01 - roles: - - openstack_share - - linux_system_codename_xenial - interfaces: - ens3: - role: single_dhcp - ens4: - role: single_ctl - - share02.mcp-queens-dvr-ssl.local: - reclass_storage_name: openstack_share_node02 - roles: - - openstack_share - - linux_system_codename_xenial - interfaces: - ens3: - role: single_dhcp - ens4: - role: single_ctl - - share03.mcp-queens-dvr-ssl.local: - reclass_storage_name: openstack_share_node03 - roles: - - openstack_share - - linux_system_codename_xenial - interfaces: - ens3: - role: single_dhcp - ens4: - role: single_ctl
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/openstack.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/openstack.yaml index a768afe..64a3ce0 100644 --- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/openstack.yaml +++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/openstack.yaml
@@ -27,10 +27,6 @@ {{ SHARED_OPENSTACK.MACRO_INSTALL_HEAT() }} -{{ SHARED_OPENSTACK.MACRO_INSTALL_DESIGNATE(INSTALL_BIND=true) }} - {{ SHARED_OPENSTACK.MACRO_INSTALL_HORIZON() }} {{ SHARED_OPENSTACK.MACRO_INSTALL_COMPUTE(CELL_MAPPING=true) }} - -{{ SHARED_OPENSTACK.MACRO_INSTALL_MANILA() }}