Add cinder service user metadata
Enable cinder service user by default
Change-Id: I7bd21385b43cefa8b8a95f9d11f0c007b6cc9f2b
Related-Prod: PROD-25985
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index 7f8e2d7..286f2ad 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -52,6 +52,8 @@
user: cinder
password: ${_param:keystone_cinder_password}
protocol: ${_param:cluster_internal_protocol}
+ service_user:
+ enabled: ${_param:cinder_service_user_enabled}
glance:
host: ${_param:cluster_vip_address}
port: 9292
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index b8f670d..2d662f9 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -31,6 +31,8 @@
identity:
protocol: ${_param:internal_protocol}
region: ${_param:openstack_region}
+ service_user:
+ enabled: ${_param:cinder_service_user_enabled}
barbican:
enabled: ${_param:barbican_integration_enabled}
message_queue:
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index 301946b..e42eef3 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -33,6 +33,8 @@
identity:
host: ${_param:single_address}
region: ${_param:openstack_region}
+ service_user:
+ enabled: ${_param:cinder_service_user_enabled}
cache:
security:
enabled: ${_param:cinder_memcache_security_enabled}
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index 9531aa4..a865722 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -44,6 +44,8 @@
host: ${_param:openstack_control_address}
protocol: ${_param:cluster_internal_protocol}
region: ${_param:openstack_region}
+ service_user:
+ enabled: ${_param:cinder_service_user_enabled}
cache:
security:
enabled: ${_param:cinder_memcache_security_enabled}
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 3219285..3eddebc 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -34,6 +34,7 @@
cinder_old_version: ${_param:openstack_old_version}
cinder_version: ${_param:openstack_version}
cinder_upgrade_enabled: ${_param:openstack_upgrade_enabled}
+ cinder_service_user_enabled: True
# Nova
nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
nova_memcache_secret_key: ''