| commit | 931892e0558d7ac41e08eaa6d2eabff17cc43483 | [log] [tgz] |
|---|---|---|
| author | Tatyana Leontovich <tleontovich@mirantis.com> | Thu Oct 18 14:27:12 2018 +0300 |
| committer | Tatyana Leontovich <tleontovich@mirantis.com> | Wed Oct 24 16:25:35 2018 +0300 |
| tree | dab440764d98c852e0b9d33abde3531088be2397 | |
| parent | 707b215c5c59ff03ad1e5e779f6f4e97530dd1fb [diff] |
Enable octavia on pike deploy Change-Id: I2a000d90de9d55321130f30c27c2de8ba48c7a58
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml index 068396b..36e2ee0 100644 --- a/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml +++ b/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml
@@ -203,3 +203,5 @@ openstack_share_node01_hostname: share01 openstack_share_node02_hostname: share02 openstack_share_node03_hostname: share03 + openstack_octavia_enabled: 'True' +
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr/_context-environment.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr/_context-environment.yaml index 8ec7377..abd8d0f 100644 --- a/tcp_tests/templates/cookied-mcp-pike-dvr/_context-environment.yaml +++ b/tcp_tests/templates/cookied-mcp-pike-dvr/_context-environment.yaml
@@ -185,7 +185,6 @@ gtw01.mcp-pike-dvr.local: reclass_storage_name: openstack_gateway_node01 roles: - - openstack_gateway - linux_system_codename_xenial interfaces: ens3:
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr/openstack.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr/openstack.yaml index 000f4f9..59e85e3 100644 --- a/tcp_tests/templates/cookied-mcp-pike-dvr/openstack.yaml +++ b/tcp_tests/templates/cookied-mcp-pike-dvr/openstack.yaml
@@ -56,3 +56,8 @@ {{ SHARED_OPENSTACK.MACRO_INSTALL_COMPUTE(CELL_MAPPING=true) }} {{ SHARED_OPENSTACK.MACRO_INSTALL_MANILA() }} + +{{ SHARED_OPENSTACK.MACRO_INSTALL_OCTAVIA_API() }} + +{{ SHARED_OPENSTACK.MACRO_INSTALL_OCTAVIA_MANAGER() }} +