commit 24966f3182997a887aa3bcb291d5dc834bc5f783
author Éric Lemoine <elemoine@mirantis.com> Fri Dec 16 14:32:55 2016 +0000
committer Éric Lemoine <elemoine@mirantis.com> Fri Dec 16 14:32:56 2016 +0000
tree 91bd7a8e5c784af0da3273fdccfa5fc689201856
parent 0516f09b14f590b1b4da7dd63f199b204280539a

Use ceilometer_influxdb_password instead of stacklight

https://github.com/Mirantis/mk-lab-salt-model/pull/194

ceilometer/server/cluster.yml

diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 572d571..0cbdd82 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -10,7 +10,7 @@
           host: ${_param:stacklight_monitor_node01_address}
           port: 8086
           user: ceilometer
-          password: ${_param:stacklight_influxdb_password}
+          password: ${_param:ceilometer_influxdb_password}
           database: ceilometer
         elasticsearch:
           enabled: true

ceilometer/server/single.yml

diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index afcc5e6..a8b1f90 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -8,7 +8,7 @@
           host: ${_param:stacklight_monitor_node01_address}
           port: 8086
           user: ceilometer
-          password: ${_param:stacklight_influxdb_password}
+          password: ${_param:ceilometer_influxdb_password}
           database: ceilometer
         elasticsearch:
           enabled: true

heka/ceilometer_collector/single.yml

diff --git a/heka/ceilometer_collector/single.yml b/heka/ceilometer_collector/single.yml
index d350a69..0ad299d 100644
--- a/heka/ceilometer_collector/single.yml
+++ b/heka/ceilometer_collector/single.yml
@@ -7,7 +7,7 @@
       enabled: true
       influxdb_database: ceilometer
       influxdb_host: ${_param:stacklight_monitor_node01_address}
-      influxdb_password: ${_param:_param:influxdb_password}
+      influxdb_password: ${_param:ceilometer_influxdb_password}
       influxdb_port: 8086
       influxdb_username: ceilometer
       resource_decoding: false

influxdb/database/ceilometer.yml

diff --git a/influxdb/database/ceilometer.yml b/influxdb/database/ceilometer.yml
index d5f86c4..8e1d9ab 100644
--- a/influxdb/database/ceilometer.yml
+++ b/influxdb/database/ceilometer.yml
@@ -14,7 +14,7 @@
         ceilometer:
           enabled: true
           name: ceilometer
-          password: ${_param:influxdb_stacklight_password}
+          password: ${_param:ceilometer_influxdb_password}
       grant:
         grant_ceilometer_all:
           enabled: true