| commit | 997821d432231eddba7be6ec0afa0d04e0d27403 | [log] [tgz] |
|---|---|---|
| author | Tatyanka Leontovich <tleontovich@mirantis.com> | Fri Jan 18 15:22:04 2019 +0000 |
| committer | Gerrit Code Review <support@gerrithub.io> | Fri Jan 18 15:22:04 2019 +0000 |
| tree | d230bfaf39b4465b81c44c8cb79fae3eeb38833e | |
| parent | fc4bde40afca5db02bbc865427c8581f1f893513 [diff] | |
| parent | f70c94e0d96af1113388c9d0e816c5aa3ab01990 [diff] |
Merge "Add set flag after bootstrap" 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() }}