aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/gnocchi-base.yaml6
-rw-r--r--puppet/services/keystone.yaml2
2 files changed, 4 insertions, 4 deletions
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'
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index e98be118..404ce6cd 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -87,7 +87,7 @@ parameters:
KeystoneWorkers:
type: string
description: Set the number of workers for keystone::wsgi::apache
- default: '$::processorcount'
+ default: '"%{::processorcount}"'
outputs:
role_data:
description: Role data for the Keystone role.