Remove old parameters (part 4)
* cinder_version doesn't exist in CC templates
* storage_vlan
* sriov_network_subnet
PROD-36375
Change-Id: I9617bb079dce3706623f6a067938e95726741391
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 957a961..4c2f81e 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
@@ -327,7 +327,6 @@
openstack_proxy_node02_hostname: prx02
openstack_upgrade_node01_address: 10.167.11.19
openstack_version: pike
- cinder_version: ${_param:openstack_version}
platform: openstack_enabled
public_host: ${_param:openstack_proxy_address}
salt_api_password: HlcaUHzUnsWsg62uhF8ua5KEbqRbzijz
@@ -368,7 +367,6 @@
tenant_vlan: '2406'
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'True'
- sriov_network_subnet: 192.168.10.0/24
ceph_enabled: 'False'
rsync_fernet_rotation: 'True'
@@ -409,7 +407,7 @@
openstack_public_neutron_subnet_allocation_start: 172.17.42.82
openstack_public_neutron_subnet_allocation_end: 172.17.42.112
backend_vlan: '2402'
- storage_vlan: '2405' # not implemented yet, placeholder
+
manila_enabled: 'False'
openscap_enabled: 'True'
octavia_health_manager_node01_address: 192.168.1.10