Remove old parameters from all depployments
* oss_enable and oss_*
* gainsight_service_enabled
* shared_reclass_*
parameters are absent in cookiecutter-templates repo
PROD-36375
Change-Id: I4d9f73f9d1ec77706f82d43c25bee751ee602db1
diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 60d28a2..f89349d 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -708,19 +708,14 @@
openstack_upgrade_node01_address: 10.167.11.19
openstack_version: pike
cinder_version: ${_param:openstack_version}
- oss_enabled: 'False'
- oss_node03_address: ${_param:stacklight_monitor_node03_address}
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
salt_master_address: 10.167.11.5
salt_master_hostname: cfg01
salt_master_management_address: 172.16.164.2
- shared_reclass_branch: proposed
- shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
stacklight_enabled: 'True'
stacklight_log_address: 10.167.11.60
stacklight_log_hostname: log
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index bc5cf98..31efecc 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -723,19 +723,14 @@
openstack_upgrade_node01_address: 10.167.11.19
openstack_version: queens
cinder_version: ${_param:openstack_version}
- oss_enabled: 'False'
- oss_node03_address: ${_param:stacklight_monitor_node03_address}
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
salt_master_address: 10.167.11.5
salt_master_hostname: cfg01
salt_master_management_address: 172.16.164.2
- shared_reclass_branch: proposed
- shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
stacklight_enabled: 'True'
stacklight_log_address: 10.167.11.60
stacklight_log_hostname: log
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 2c379ea..4a01c59 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
@@ -334,19 +334,14 @@
openstack_upgrade_node01_address: 10.167.11.19
openstack_version: pike
cinder_version: ${_param:openstack_version}
- oss_enabled: 'False'
- oss_node03_address: ${_param:stacklight_monitor_node03_address}
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
salt_master_address: 172.16.162.66
salt_master_hostname: cfg01
salt_master_management_address: 172.16.162.66
- shared_reclass_branch: proposed
- shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
stacklight_enabled: 'True'
stacklight_log_address: 10.167.11.60
stacklight_log_hostname: log
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index b8fdb18..89bb83e 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -334,19 +334,14 @@
openstack_upgrade_node01_address: 10.167.11.19
openstack_version: pike
cinder_version: ${_param:openstack_version}
- oss_enabled: 'False'
- oss_node03_address: ${_param:stacklight_monitor_node03_address}
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
salt_master_address: 172.16.162.66
salt_master_hostname: cfg01
salt_master_management_address: 172.16.162.66
- shared_reclass_branch: proposed
- shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
stacklight_enabled: 'True'
stacklight_log_address: 10.167.11.60
stacklight_log_hostname: log
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
index f45108a..b956edf 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -772,21 +772,14 @@
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: ==IPV4_NET_CONTROL_PREFIX==.19
openstack_version: pike
- oss_enabled: 'False'
- oss_node03_address: ${_param:stacklight_monitor_node03_address}
- oss_webhook_app_id: '24'
- oss_webhook_login_id: '13'
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: BNRhXeGFdgVNx0Ikm2CAMw7eyeHf4grH
salt_api_password_hash: $6$jriFnsbZ$eon54Ts/Kn4ywKpexe/W8srpBF64cxr2D8jd0RzTH8zdZVjS3viYt64m1d1VlXenurwpcGLkGzaGmOI0dlOox0
salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
salt_master_hostname: cfg01
salt_master_management_address: ==IPV4_NET_ADMIN_PREFIX==.2
- shared_reclass_branch: ''
- shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
stacklight_enabled: 'True'
stacklight_log_address: ==IPV4_NET_CONTROL_PREFIX==.60
stacklight_log_hostname: log
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index 835952c..bb3d3d6 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -772,21 +772,14 @@
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: ==IPV4_NET_CONTROL_PREFIX==.19
openstack_version: queens
- oss_enabled: 'False'
- oss_node03_address: ${_param:stacklight_monitor_node03_address}
- oss_webhook_app_id: '24'
- oss_webhook_login_id: '13'
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: BNRhXeGFdgVNx0Ikm2CAMw7eyeHf4grH
salt_api_password_hash: $6$jriFnsbZ$eon54Ts/Kn4ywKpexe/W8srpBF64cxr2D8jd0RzTH8zdZVjS3viYt64m1d1VlXenurwpcGLkGzaGmOI0dlOox0
salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
salt_master_hostname: cfg01
salt_master_management_address: ==IPV4_NET_ADMIN_PREFIX==.2
- shared_reclass_branch: ''
- shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
stacklight_enabled: 'True'
stacklight_log_address: ==IPV4_NET_CONTROL_PREFIX==.60
stacklight_log_hostname: log
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 8ad96c6..31b9b8f 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -138,7 +138,6 @@
dns_server01: 172.18.176.6
dns_server02: 172.18.224.6
email_address: test@mirantis.com
- gainsight_service_enabled: 'False'
gateway_primary_first_nic: eth1
gateway_primary_second_nic: eth2
gnocchi_aggregation_storage: ceph
@@ -244,18 +243,14 @@
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: 10.167.4.19
openstack_version: pike
- oss_enabled: 'False'
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: BX7ium4MaRPIWBdyhj4LTbiedwg3yLep
salt_api_password_hash: $6$qYqzkiRP$MiqA5ZMfsmdXJcuTTyeCgNPv9CBGO5nSH4HwRKPGUh0MFXcEa8JDCUEtS8xLHCkol7CMdq.l6CG7of0iaUJ.u.
salt_master_address: 10.167.4.15
salt_master_hostname: cfg01
salt_master_management_address: 10.167.5.15
- shared_reclass_branch: 'proposed'
- shared_reclass_url: https://github.com/Mirantis/reclass-system-salt-model.git
sriov_network_subnet: 10.55.0.0/16
static_ips_on_deploy_network_enabled: 'False'
tenant_network_gateway: 10.167.6.1
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 63f0f22..8800242 100644
--- a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -193,21 +193,14 @@
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: ==IPV4_NET_CONTROL_PREFIX==.19
openstack_version: queens
- oss_enabled: 'False'
- oss_node03_address: ${_param:stacklight_monitor_node03_address}
- oss_webhook_app_id: '24'
- oss_webhook_login_id: '13'
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: BNRhXeGFdgVNx0Ikm2CAMw7eyeHf4grH
salt_api_password_hash: $6$jriFnsbZ$eon54Ts/Kn4ywKpexe/W8srpBF64cxr2D8jd0RzTH8zdZVjS3viYt64m1d1VlXenurwpcGLkGzaGmOI0dlOox0
salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
salt_master_hostname: cfg01
salt_master_management_address: ==IPV4_NET_ADMIN_PREFIX==.15
- shared_reclass_branch: ''
- shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
stacklight_enabled: 'True'
stacklight_log_address: ==IPV4_NET_CONTROL_PREFIX==.60
stacklight_log_hostname: log
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 4522bd7..9b4bc0b 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
@@ -143,7 +143,6 @@
dns_server01: 172.18.176.6
dns_server02: 172.18.224.6
email_address: test@mirantis.com
- gainsight_service_enabled: 'False'
gateway_primary_first_nic: eth1
gateway_primary_second_nic: eth2
gnocchi_aggregation_storage: ceph
@@ -249,18 +248,14 @@
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: 10.167.4.19
openstack_version: queens
- oss_enabled: 'False'
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: BX7ium4MaRPIWBdyhj4LTbiedwg3yLep
salt_api_password_hash: $6$qYqzkiRP$MiqA5ZMfsmdXJcuTTyeCgNPv9CBGO5nSH4HwRKPGUh0MFXcEa8JDCUEtS8xLHCkol7CMdq.l6CG7of0iaUJ.u.
salt_master_address: 10.167.4.15
salt_master_hostname: cfg01
salt_master_management_address: 10.167.5.15
- shared_reclass_branch: 'proposed'
- shared_reclass_url: https://github.com/Mirantis/reclass-system-salt-model.git
sriov_network_subnet: 10.55.0.0/16
static_ips_on_deploy_network_enabled: 'False'
tenant_network_gateway: 10.167.6.1
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 39eb138..8655cb9 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -199,21 +199,14 @@
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: ==IPV4_NET_CONTROL_PREFIX==.19
openstack_version: pike
- oss_enabled: 'False'
- oss_node03_address: ${_param:stacklight_monitor_node03_address}
- oss_webhook_app_id: '24'
- oss_webhook_login_id: '13'
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: BNRhXeGFdgVNx0Ikm2CAMw7eyeHf4grH
salt_api_password_hash: $6$jriFnsbZ$eon54Ts/Kn4ywKpexe/W8srpBF64cxr2D8jd0RzTH8zdZVjS3viYt64m1d1VlXenurwpcGLkGzaGmOI0dlOox0
salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
salt_master_hostname: cfg01
salt_master_management_address: ==IPV4_NET_ADMIN_PREFIX==.15
- shared_reclass_branch: ''
- shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
stacklight_enabled: 'True'
stacklight_log_address: ==IPV4_NET_CONTROL_PREFIX==.60
stacklight_log_hostname: log
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index c62c526..210b5c8 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -131,7 +131,6 @@
dns_server01: 172.18.176.6
dns_server02: 172.18.224.6
email_address: test@mirantis.com
- gainsight_service_enabled: 'False'
gateway_primary_first_nic: eth1
gateway_primary_second_nic: eth2
gnocchi_aggregation_storage: ceph
@@ -237,18 +236,14 @@
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: 10.167.4.19
openstack_version: pike
- oss_enabled: 'False'
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: BX7ium4MaRPIWBdyhj4LTbiedwg3yLep
salt_api_password_hash: $6$qYqzkiRP$MiqA5ZMfsmdXJcuTTyeCgNPv9CBGO5nSH4HwRKPGUh0MFXcEa8JDCUEtS8xLHCkol7CMdq.l6CG7of0iaUJ.u.
salt_master_address: 10.167.4.15
salt_master_hostname: cfg01
salt_master_management_address: 10.167.5.15
- shared_reclass_branch: ''
- shared_reclass_url: https://github.com/Mirantis/reclass-system-salt-model.git
sriov_network_subnet: 10.55.0.0/16
static_ips_on_deploy_network_enabled: 'False'
tenant_network_gateway: 10.167.6.1
diff --git a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 5d791e8..0908f81 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -193,21 +193,14 @@
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: ==IPV4_NET_CONTROL_PREFIX==.19
openstack_version: queens
- oss_enabled: 'False'
- oss_node03_address: ${_param:stacklight_monitor_node03_address}
- oss_webhook_app_id: '24'
- oss_webhook_login_id: '13'
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: BNRhXeGFdgVNx0Ikm2CAMw7eyeHf4grH
salt_api_password_hash: $6$jriFnsbZ$eon54Ts/Kn4ywKpexe/W8srpBF64cxr2D8jd0RzTH8zdZVjS3viYt64m1d1VlXenurwpcGLkGzaGmOI0dlOox0
salt_master_address: ==IPV4_NET_CONTROL_PREFIX==.15
salt_master_hostname: cfg01
salt_master_management_address: ==IPV4_NET_ADMIN_PREFIX==.15
- shared_reclass_branch: ''
- shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
stacklight_enabled: 'True'
stacklight_log_address: ==IPV4_NET_CONTROL_PREFIX==.60
stacklight_log_hostname: log
diff --git a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index d14b2e9..bd5305a 100644
--- a/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -142,7 +142,6 @@
dns_server01: 172.18.176.6
dns_server02: 172.18.224.6
email_address: test@mirantis.com
- gainsight_service_enabled: 'False'
gateway_primary_first_nic: eth1
gateway_primary_second_nic: eth2
gnocchi_aggregation_storage: ceph
@@ -248,18 +247,14 @@
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: 10.167.4.19
openstack_version: queens
- oss_enabled: 'False'
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
publication_method: email
- reclass_repository: https://github.com/Mirantis/mk-lab-salt-model.git
salt_api_password: BX7ium4MaRPIWBdyhj4LTbiedwg3yLep
salt_api_password_hash: $6$qYqzkiRP$MiqA5ZMfsmdXJcuTTyeCgNPv9CBGO5nSH4HwRKPGUh0MFXcEa8JDCUEtS8xLHCkol7CMdq.l6CG7of0iaUJ.u.
salt_master_address: 10.167.4.15
salt_master_hostname: cfg01
salt_master_management_address: 10.167.5.15
- shared_reclass_branch: ''
- shared_reclass_url: https://github.com/Mirantis/reclass-system-salt-model.git
sriov_network_subnet: 10.55.0.0/16
static_ips_on_deploy_network_enabled: 'False'
tenant_network_gateway: 10.167.6.1