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/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
index 4a01c59..695b947 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-odl-maas/salt-context-cookiecutter-openstack_odl.yaml
@@ -20,17 +20,14 @@
control_network_netmask: 255.255.255.0
control_network_subnet: 10.167.11.0/24
control_vlan: '2404'
- cookiecutter_template_branch: proposed
+
jenkins_pipelines_branch: 'release/2019.2.0'
- cookiecutter_template_credentials: gerrit
- cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
deploy_network_gateway: 172.16.162.65
deploy_network_netmask: 255.255.255.192
deploy_network_subnet: 172.16.162.64/26
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
infra_bond_mode: active-backup
@@ -55,7 +52,6 @@
maas_deploy_gateway: 172.16.162.65
maas_deploy_range_end: 172.16.162.125
maas_deploy_range_start: 172.16.162.82
- maas_deploy_vlan: '0'
maas_dhcp_enabled: 'True'
maas_fabric_name: fabric-0
maas_hostname: cfg01
@@ -368,7 +364,6 @@
stacklight_telemetry_node02_hostname: mtr02
stacklight_telemetry_node03_address: 10.167.11.99
stacklight_telemetry_node03_hostname: mtr03
- stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
tenant_network_gateway: 10.167.13.1
tenant_network_netmask: 255.255.255.0
@@ -427,7 +422,6 @@
octavia_health_manager_node03_address: 192.168.1.12
octavia_manager_cluster: 'False'
octavia_spare_amphora_pool_size: 0
- octavia_hm_bind_ip: 192.168.1.12
octavia_lb_mgmt_cidr: 192.168.1.0/24
octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
octavia_lb_mgmt_allocation_pool_end: 192.168.1.200