Generate random keystone users
Change-Id: I8dbd07b10d29b43d1c35fa76bcaa0f0efb32beda
Related-Prod: PROD-29868
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index a81d257..f881efc 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -36,7 +36,7 @@
host: ${_param:openstack_database_address}
port: 3306
name: cinder
- user: cinder
+ user: ${_param:mysql_cinder_username}
password: ${_param:mysql_cinder_password}
x509:
enabled: ${_param:openstack_mysql_x509_enabled}
@@ -51,7 +51,7 @@
host: ${_param:cluster_vip_address}
port: 35357
tenant: service
- user: cinder
+ user: ${_param:keystone_cinder_username}
password: ${_param:keystone_cinder_password}
protocol: ${_param:cluster_internal_protocol}
service_user:
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 31b391b..6ddbdd4 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -22,6 +22,8 @@
# set 'image_conversion_dir' option in case of ceph deployment volume and controller running on the same node
image_conversion_dir: ${_param:cinder_image_conversion_dir_path}
database:
+ user: ${_param:mysql_cinder_username}
+ password: ${_param:mysql_cinder_password}
host: ${_param:single_address}
x509:
enabled: ${_param:openstack_mysql_x509_enabled}
@@ -31,6 +33,8 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
identity:
+ user: ${_param:keystone_cinder_username}
+ password: ${_param:keystone_cinder_password}
protocol: ${_param:internal_protocol}
region: ${_param:openstack_region}
service_user:
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index 6478d6f..3648ad9 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -9,6 +9,8 @@
enabled: True
image_conversion_dir: ${_param:cinder_image_conversion_dir_path}
database:
+ user: ${_param:mysql_cinder_username}
+ password: ${_param:mysql_cinder_password}
host: ${_param:single_address}
x509:
enabled: ${_param:openstack_mysql_x509_enabled}
@@ -32,6 +34,8 @@
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
identity:
+ user: ${_param:keystone_cinder_username}
+ password: ${_param:keystone_cinder_password}
host: ${_param:single_address}
region: ${_param:openstack_region}
service_user:
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index 74f2344..52ecaf1 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -15,6 +15,8 @@
enabled: True
image_conversion_dir: ${_param:cinder_image_conversion_dir_path}
database:
+ user: ${_param:mysql_cinder_username}
+ password: ${_param:mysql_cinder_password}
host: ${_param:openstack_database_address}
x509:
enabled: ${_param:openstack_mysql_x509_enabled}
@@ -42,6 +44,8 @@
ssl:
enabled: ${_param:rabbitmq_ssl_enabled}
identity:
+ user: ${_param:keystone_cinder_username}
+ password: ${_param:keystone_cinder_password}
host: ${_param:openstack_control_address}
protocol: ${_param:cluster_internal_protocol}
region: ${_param:openstack_region}