diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-03-19 11:18:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-03-19 11:18:49 +0000 |
| commit | 26d873f19002ec9c6318da1ab708a824e01be3a0 (patch) | |
| tree | fa0da1065230d570f7b61db354c19e49d93e12a2 | |
| parent | 5bb35b7a050f23887a726547ce37519c6604e8fe (diff) | |
| parent | dc5d2373c6b6bb5859bcd2ee5f81249ab8ca7eee (diff) | |
Merge "puppet: tidy up the Nova ceilo auth configs"
| -rw-r--r-- | puppet/compute-puppet.yaml | 9 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index 909fdf5c..c98d1b0e 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -296,11 +296,11 @@ resources: #ceilometer::debug: {get_input: debug} ceilometer::metering_secret: {get_input: ceilometer_metering_secret} ceilometer::agent::auth::auth_password: {get_input: ceilometer_password} + ceilometer::agent::auth::auth_url: {get_input: ceilometer_agent_auth_url} ceilometer_compute_agent: {get_input: ceilometer_compute_agent} snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name} snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password} nova::glance_api_servers: {get_input: glance_api_servers} - keystone_host: {get_input: keystone_host} #neutron::debug: {get_input: debug} neutron_flat_networks: {get_input: neutron_flat_networks} neutron_host: {get_input: neutron_host} @@ -352,6 +352,12 @@ resources: ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} ceilometer_password: {get_param: CeilometerPassword} ceilometer_compute_agent: {get_param: CeilometerComputeAgent} + ceilometer_agent_auth_url: + list_join: + - '' + - - 'http://' + - {get_param: KeystoneHost} + - ':5000/v2.0' snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName} snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} glance_api_servers: @@ -362,7 +368,6 @@ resources: - {get_param: GlanceHost} - ':' - {get_param: GlancePort} - keystone_host: {get_param: KeystoneHost} neutron_flat_networks: {get_param: NeutronFlatNetworks} neutron_host: {get_param: NeutronHost} neutron_local_ip: {get_attr: [NovaCompute, networks, ctlplane, 0]} diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 63ead74f..eef468da 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -71,10 +71,7 @@ class { 'neutron::agents::ml2::ovs': include ::ceilometer include ::ceilometer::agent::compute - -class { 'ceilometer::agent::auth': - auth_url => join(['http://', hiera('keystone_host'), ':5000/v2.0']), -} +include ::ceilometer::agent::auth $snmpd_user = hiera('snmpd_readonly_user_name') snmp::snmpv3_user { $snmpd_user: |