Merge "Add nova metadata for memcache security strategy"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index e2856a0..c5464d3 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -6,3 +6,6 @@
# for non-ssl use 5672 / for ssl 5671
openstack_rabbitmq_port: 5672
openstack_rabbitmq_x509_enabled: False
+ # Openstack memcache security
+ openstack_memcache_security_enabled: False
+ openstack_memcache_security_strategy: 'ENCRYPT'
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 3a1314d..92871c0 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -37,6 +37,8 @@
SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
-----END RSA PRIVATE KEY-----
cluster_internal_protocol: 'http'
+ nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+ nova_memcache_secret_key: ''
openssh:
client:
enabled: True
@@ -111,3 +113,8 @@
libvirt:
migration_inbound_addr: ${_param:single_address}
my_ip: ${_param:single_address}
+ cache:
+ security:
+ enabled: ${_param:nova_memcache_security_enabled}
+ strategy: ${_param:openstack_memcache_security_strategy}
+ secret_key: ${_param:nova_memcache_secret_key}
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index aff1bd3..90a2fa7 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -37,6 +37,8 @@
SG9MrLHCd5l60aCUQg0UA5ed7Hd6SA314k+HwxJno9/wJ+voBeacMg==
-----END RSA PRIVATE KEY-----
cluster_internal_protocol: 'http'
+ nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+ nova_memcache_secret_key: ''
openssh:
client:
enabled: True
@@ -100,6 +102,10 @@
members:
- host: 127.0.0.1
port: 11211
+ security:
+ enabled: ${_param:nova_memcache_security_enabled}
+ strategy: ${_param:openstack_memcache_security_strategy}
+ secret_key: ${_param:nova_memcache_secret_key}
user:
public_key: ${_param:nova_compute_ssh_public}
private_key: ${_param:nova_compute_ssh_private}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 31f2d6e..3a2e293 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -14,6 +14,8 @@
nova_disk_allocation_ratio: 1.0
metadata_password: metadataPass
cluster_internal_protocol: 'http'
+ nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+ nova_memcache_secret_key: ''
linux:
system:
package:
@@ -79,6 +81,11 @@
cert_file: ${_param:rabbitmq_nova_client_ssl_cert_file}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
+ cache:
+ security:
+ enabled: ${_param:nova_memcache_security_enabled}
+ strategy: ${_param:openstack_memcache_security_strategy}
+ secret_key: ${_param:nova_memcache_secret_key}
glance:
host: ${_param:cluster_vip_address}
port: 9292
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 07c8dc2..51e856f 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -5,6 +5,8 @@
parameters:
_param:
cluster_internal_protocol: 'http'
+ nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
+ nova_memcache_secret_key: ''
linux:
system:
package:
@@ -40,4 +42,8 @@
cert_file: ${_param:rabbitmq_nova_client_ssl_cert_file}
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
-
+ cache:
+ security:
+ enabled: ${_param:nova_memcache_security_enabled}
+ strategy: ${_param:openstack_memcache_security_strategy}
+ secret_key: ${_param:nova_memcache_secret_key}