x/packstack
Code Issues Proposed changes

Merge "[Ceilometer] set region to CONFIG_KEYSTONE_REGION"

Browse Source
This commit is contained in:
Jenkins
2015-10-06 18:56:45 +00:00
committed by Gerrit Code Review
parent 5d6deea816 a6d81ccac8
commit b3b71a28c4
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packstack/puppet/templates/ceilometer.pp
View File

@@ -37,6 +37,7 @@ class { '::ceilometer::agent::notification': }
class { '::ceilometer::agent::auth': class { '::ceilometer::agent::auth':
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_password => hiera('CONFIG_CEILOMETER_KS_PW'), auth_password => hiera('CONFIG_CEILOMETER_KS_PW'),
auth_region => hiera('CONFIG_KEYSTONE_REGION'),
} }
class { '::ceilometer::agent::central': class { '::ceilometer::agent::central':

1
packstack/puppet/templates/nova_ceilometer.pp
View File

@@ -1,6 +1,7 @@
class { '::ceilometer::agent::auth': class { '::ceilometer::agent::auth':
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_password => hiera('CONFIG_CEILOMETER_KS_PW'), auth_password => hiera('CONFIG_CEILOMETER_KS_PW'),
auth_region => hiera('CONFIG_KEYSTONE_REGION'),
} }
class { '::ceilometer::agent::compute': } class { '::ceilometer::agent::compute': }