diff options
| -rw-r--r-- | puppet/compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/gnocchi-base.yaml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 8de9a19c..d4fdea3d 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -485,7 +485,7 @@ resources: upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute} ceilometer_metering_secret: {get_param: CeilometerMeteringSecret} ceilometer_password: {get_param: CeilometerPassword} - ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]} + ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]} neutron_password: {get_param: NeutronPassword} diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml index 44f3c3c7..e49c440b 100644 --- a/puppet/services/gnocchi-base.yaml +++ b/puppet/services/gnocchi-base.yaml @@ -72,10 +72,10 @@ outputs: gnocchi::storage::ceph::ceph_keyring: list_join: - '.' - - - '/etc/ceph/ceph/' - - 'client/' + - - '/etc/ceph/ceph' + - 'client' - {get_param: CephClientUserName} - - '/keyring' + - 'keyring' #Gnocchi statsd gnocchi::statsd::manage_service: false gnocchi::statsd::resource_id: '0a8b55df-f90f-491c-8cb9-7cdecec6fc26' |