| commit | 7f6284e77908f8c12a84198bc78fcb68cad528d5 | [log] [tgz] |
|---|---|---|
| author | Tatyanka Leontovich <tleontovich@mirantis.com> | Fri Jan 25 11:29:45 2019 +0000 |
| committer | Gerrit Code Review <support@gerrithub.io> | Fri Jan 25 11:29:45 2019 +0000 |
| tree | 7af31edd8dc686ce3d51a6be7fe4acf7291bbf65 | |
| parent | 8dbadc3d78b6817e5341abd7ea95b048c3560ec2 [diff] | |
| parent | c48f435049b329d213f9a66c44983a300346de2c [diff] |
Merge "Update runtestmanager and models"
diff --git a/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/salt-context-cookiecutter-contrail.yaml index 8fa0367..4baed1d 100644 --- a/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/salt-context-cookiecutter-contrail.yaml +++ b/tcp_tests/templates/cookied-cicd-bm-ocata-contrail-maas/salt-context-cookiecutter-contrail.yaml
@@ -372,9 +372,9 @@ stacklight_telemetry_node03_hostname: mtr03 stacklight_version: '2' static_ips_on_deploy_network_enabled: 'False' - tenant_network_gateway: 192.168.0.220 + tenant_network_gateway: 10.167.10.253 tenant_network_netmask: 255.255.255.0 - tenant_network_subnet: 192.168.0.0/24 + tenant_network_subnet: 10.167.10.0/24 upstream_proxy_enabled: 'False' use_default_network_scheme: 'True' openldap_domain: cookied-cicd-bm-ocata-contrail-maas.local
diff --git a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml index 1903e69..342b46c 100644 --- a/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml +++ b/tcp_tests/templates/cookied-cicd-bm-os-contrail40-maas/salt-context-cookiecutter-contrail.yaml
@@ -372,9 +372,9 @@ stacklight_telemetry_node03_hostname: mtr03 stacklight_version: '2' static_ips_on_deploy_network_enabled: 'False' - tenant_network_gateway: 192.168.0.220 + tenant_network_gateway: 10.167.10.253 tenant_network_netmask: 255.255.255.0 - tenant_network_subnet: 192.168.0.0/24 + tenant_network_subnet: 10.167.10.0/24 upstream_proxy_enabled: 'False' use_default_network_scheme: 'True' openldap_domain: cookied-bm-4.0-contrail.local
diff --git a/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/salt-context-cookiecutter-contrail.yaml index 7ae7074..e4bc249 100644 --- a/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/salt-context-cookiecutter-contrail.yaml +++ b/tcp_tests/templates/cookied-cicd-bm-queens-contrail-maas/salt-context-cookiecutter-contrail.yaml
@@ -372,9 +372,9 @@ stacklight_telemetry_node03_hostname: mtr03 stacklight_version: '2' static_ips_on_deploy_network_enabled: 'False' - tenant_network_gateway: 192.168.0.220 + tenant_network_gateway: 10.167.10.253 tenant_network_netmask: 255.255.255.0 - tenant_network_subnet: 192.168.0.0/24 + tenant_network_subnet: 10.167.10.0/24 upstream_proxy_enabled: 'False' use_default_network_scheme: 'True' openldap_domain: cookied-cicd-bm-queens-contrail-maas.local