Generate random keystone users
Depends-On: https://gerrit.mcp.mirantis.com/#/c/44319/
Depends-On: https://gerrit.mcp.mirantis.com/#/c/45118/
Depends-On: https://gerrit.mcp.mirantis.com/#/c/45119/
Related-Prod: PROD-29868
Related-Prod: PROD-31315
(cherry picked from commit f5956c2f6151cc5d99659103f90641ea66eac44a)
(cherry picked from commit 70dd0f0587eb297fbefdea43837839c4983b8378)
Change-Id: I402be73437d5397224184a4fd71e2f6abae24db2
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 6bb4e71..c24adf7 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -17,7 +17,7 @@
host: ${_param:keystone_service_host}
port: 35357
tenant: service
- user: ceilometer
+ user: ${_param:keystone_ceilometer_username}
password: ${_param:keystone_ceilometer_password}
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index 037bb4e..0bf079f 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -9,6 +9,8 @@
ssl:
enabled: ${_param:ceilometer_agent_ssl_enabled}
identity:
+ user: ${_param:keystone_ceilometer_username}
+ password: ${_param:keystone_ceilometer_password}
protocol: ${_param:internal_protocol}
message_queue:
port: ${_param:openstack_rabbitmq_port}
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index 26f9a68..8f9c996 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -17,7 +17,7 @@
host: ${_param:keystone_service_host}
port: 35357
tenant: service
- user: ceilometer
+ user: ${_param:keystone_ceilometer_username}
password: ${_param:keystone_ceilometer_password}
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 0704a2b..485eda2 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -29,7 +29,7 @@
host: ${_param:openstack_control_address}
port: 35357
tenant: service
- user: ceilometer
+ user: ${_param:keystone_ceilometer_username}
password: ${_param:keystone_ceilometer_password}
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}
diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
index c7d2686..9ee78ef 100644
--- a/ceilometer/server/telemetry/cluster.yml
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -25,7 +25,7 @@
host: ${_param:openstack_control_address}
port: 35357
tenant: service
- user: ceilometer
+ user: ${_param:keystone_ceilometer_username}
password: ${_param:keystone_ceilometer_password}
region: ${_param:openstack_region}
protocol: ${_param:cluster_internal_protocol}