PROD-36375 remove old parameters (part 2)
* cookiecutter_template_* , email_address parameters relates to ModelDesigner only
* stacklight_version absent in CC-templates
* octavia_hm_bind_ip absent in CC-templates
* vnf_onboarding_enabled
* maas_deploy_vlan
Change-Id: I9cb42c84e723bc2695147c8343117e5234e6897c
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 9b4bc0b..11a674c 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -133,16 +133,13 @@
control_network_netmask: 255.255.255.0
control_network_subnet: 10.167.4.0/24
control_vlan: '10'
- cookiecutter_template_branch: 'proposed'
- cookiecutter_template_credentials: gerrit
- cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
+
deploy_network_gateway: 10.167.5.1
deploy_network_netmask: 255.255.255.0
deploy_network_subnet: 10.167.5.0/24
deployment_type: physical
dns_server01: 172.18.176.6
dns_server02: 172.18.224.6
- email_address: test@mirantis.com
gateway_primary_first_nic: eth1
gateway_primary_second_nic: eth2
gnocchi_aggregation_storage: ceph
@@ -168,7 +165,6 @@
maas_deploy_network_name: deploy_network
maas_deploy_range_end: 10.167.5.230
maas_deploy_range_start: 10.167.5.20
- maas_deploy_vlan: '0'
maas_enabled: 'False'
maas_fabric_name: deploy_fabric
maas_hostname: cfg01
@@ -265,7 +261,6 @@
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'True'
version: proposed
- vnf_onboarding_enabled: 'False'
tenant_telemetry_enabled: 'True'
openstack_telemetry_address: 10.167.4.83
openstack_telemetry_hostname: mdb
@@ -301,7 +296,6 @@
stacklight_telemetry_node02_hostname: mtr02
stacklight_telemetry_node03_address: 10.167.4.99
stacklight_telemetry_node03_hostname: mtr03
- stacklight_version: '2'
stacklight_long_term_storage_type: prometheus
nova_vnc_tls_enabled: 'True'
galera_ssl_enabled: 'True'
@@ -374,7 +368,6 @@
octavia_manager_cluster: 'True'
octavia_amphora_topology: 'ACTIVE_STANDBY'
octavia_spare_amphora_pool_size: 0
- octavia_hm_bind_ip: 192.168.10.12
octavia_lb_mgmt_cidr: 192.168.10.0/24
octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
octavia_lb_mgmt_allocation_pool_end: 192.168.10.200