Merge "Revert "Add neutron metadata for memcache security strategy""
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 49ad5c6..f8949e9 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -9,9 +9,6 @@
# Openstack memcache security
openstack_memcache_security_enabled: False
openstack_memcache_security_strategy: 'ENCRYPT'
- # Neutron
- neutron_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
- neutron_memcache_secret_key: ''
# Cinder
cinder_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
cinder_memcache_secret_key: ''
diff --git a/neutron/compute/cluster.yml b/neutron/compute/cluster.yml
index 0523c3f..a9cf9c1 100644
--- a/neutron/compute/cluster.yml
+++ b/neutron/compute/cluster.yml
@@ -38,8 +38,3 @@
cert_file: ${_param:rabbitmq_neutron_client_ssl_cert_file}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
- cache:
- security:
- enabled: ${_param:neutron_memcache_security_enabled}
- strategy: ${_param:openstack_memcache_security_strategy}
- secret_key: ${_param:neutron_memcache_secret_key}
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 4a196fa..52a91ea 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -39,10 +39,5 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
role: ${_param:openstack_node_role}
- cache:
- security:
- enabled: ${_param:neutron_memcache_security_enabled}
- strategy: ${_param:openstack_memcache_security_strategy}
- secret_key: ${_param:neutron_memcache_secret_key}
identity:
protocol: ${_param:cluster_internal_protocol}
diff --git a/neutron/control/single.yml b/neutron/control/single.yml
index 8db8ead..40bdea3 100644
--- a/neutron/control/single.yml
+++ b/neutron/control/single.yml
@@ -34,8 +34,3 @@
enabled: ${_param:rabbitmq_ssl_enabled}
identity:
protocol: ${_param:internal_protocol}
- cache:
- security:
- enabled: ${_param:neutron_memcache_security_enabled}
- strategy: ${_param:openstack_memcache_security_strategy}
- secret_key: ${_param:neutron_memcache_secret_key}
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index bc51ab9..8f84fa1 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -31,8 +31,3 @@
cert_file: ${_param:rabbitmq_neutron_client_ssl_cert_file}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
- cache:
- security:
- enabled: ${_param:neutron_memcache_security_enabled}
- strategy: ${_param:openstack_memcache_security_strategy}
- secret_key: ${_param:neutron_memcache_secret_key}