| commit | 6361cfc2b080d8bc367852bdcb387654907f377d | [log] [tgz] |
|---|---|---|
| author | Andrew Baraniuk <abaraniuk@mirantis.com> | Tue Jun 04 12:58:14 2019 +0300 |
| committer | Andrew Baraniuk <abaraniuk@mirantis.com> | Wed Jun 12 09:11:21 2019 +0000 |
| tree | f3d19bbae3418788e267172123eb42fc9f9a123f | |
| parent | 22628a3d674de7f4dfee17393e99e791ee2ceccd [diff] |
Fix pike,queens contrail models Add 'secrets_encryption_enabled' and 'openstack_keystone_security' Fix vsrx for bm and heat envs Add valid public and tempest network for tests Remove kvm4-6 Change-Id: I4a1632b77f95d5197deb5970a3200606910a5e74
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml index 151dee8..48a601c 100644 --- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml +++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -134,7 +134,7 @@ opencontrail_enabled: 'True' opencontrail_router01_address: ==IPV4_NET_CONTROL_PREFIX==.220 opencontrail_router01_hostname: rtr01 - opencontrail_router02_address: ==IPV4_NET_CONTROL_PREFIX==.101 + opencontrail_router02_address: ==IPV4_NET_EXTERNAL_PREFIX==.220 opencontrail_router02_hostname: rtr02 openldap_enabled: 'True' openldap_domain: ${_param:cluster_name}.local
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml index cfda75e..46ce50c 100644 --- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml +++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml
@@ -10,6 +10,10 @@ role: single_static_mgm ens4: role: single_static_ctl + ens6: + role: single_external + external_address: 10.9.0.15 + external_network_netmask: 255.255.255.0 cid01: reclass_storage_name: cicd_control_node01
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot index 81a1a84..e421244 100644 --- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot +++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
@@ -20,7 +20,7 @@ default: "10.8.0.0/24" external_subnet_cidr: type: string - default: "192.168.200.0/24" + default: "10.9.0.0/24" management_subnet_cidr: type: string default: "10.7.0.0/24"