| commit | 85cdb04ac5d3c1401335221050f901ca453d8837 | [log] [tgz] |
|---|---|---|
| author | Tatyanka Leontovich <tleontovich@mirantis.com> | Fri Jan 18 17:26:28 2019 +0000 |
| committer | Gerrit Code Review <support@gerrithub.io> | Fri Jan 18 17:26:28 2019 +0000 |
| tree | b93e9cfb311ed7d07955c95e94aaceac6551facc | |
| parent | 19a7a35f64edd1f6a4bcfe0df093fca635a94cfe [diff] | |
| parent | 5302ce044b712e686d9ac31990cf131e26c65cf2 [diff] |
Merge "REmove flag from config" into 2018.11.0
diff --git a/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/_context-cookiecutter-mcp-mitaka-dvr-ceph.yaml b/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/_context-cookiecutter-mcp-mitaka-dvr-ceph.yaml index a049934..28f17dc 100644 --- a/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/_context-cookiecutter-mcp-mitaka-dvr-ceph.yaml +++ b/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/_context-cookiecutter-mcp-mitaka-dvr-ceph.yaml
@@ -1,6 +1,10 @@ default_context: bmk_enabled: 'False' designate_backend: bind + auditd_enabled: 'False' + backend_network_netmask: 255.255.255.0 + backend_network_subnet: 172.16.10.0/24 + backend_vlan: '30' ceph_cluster_network: 172.16.10.0/24 ceph_enabled: 'True' ceph_hyper_converged: 'False'
diff --git a/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/openstack.yaml b/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/openstack.yaml index 6d520c1..9c96218 100644 --- a/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/openstack.yaml +++ b/tcp_tests/templates/cookied-mcp-mitaka-dvr-ceph/openstack.yaml
@@ -27,7 +27,7 @@ {{ SHARED_CEPH.CONNECT_CEPH_TO_SERVICES() }} -{{ SHARED_OPENSTACK.MACRO_INSTALL_KEYSTONE() }} +{{ SHARED_OPENSTACK.MACRO_INSTALL_KEYSTONE(USE_ORCHESTRATE=true) }} {{ SHARED_OPENSTACK.MACRO_INSTALL_GLANCE() }}