Merge "Replace hard-coded regionOne with parameter references"

puppet/services/ceilometer-base.yaml

@@ -83,7 +83,7 @@ outputs:
         ceilometer::agent::auth::auth_password: {get_param: CeilometerPassword}
         ceilometer::agent::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
         ceilometer::agent::notification::store_events: {get_param: CeilometerStoreEvents}
-        ceilometer::agent::auth::auth_region: 'regionOne'
+        ceilometer::agent::auth::auth_region: {get_param: KeystoneRegion}
         ceilometer::agent::auth::auth_tenant_name: 'service'
         ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
         ceilometer::db::mysql::password: {get_param: CeilometerPassword}

puppet/services/gnocchi-base.yaml

@@ -30,6 +30,10 @@ parameters:
   CephClientUserName:
     default: openstack
     type: string
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
 
 outputs:
   aux_parameters:
@@ -52,7 +56,7 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/gnocchi'
-        gnocchi::keystone::auth::region: 'regionOne'
+        gnocchi::keystone::auth::region: {get_param: KeystoneRegion}
         gnocchi::keystone::auth::tenant: 'service'
         gnocchi::keystone::auth::password: {get_param: GnocchiPassword}
         gnocchi::db::mysql::password: {get_param: GnocchiPassword}
@@ -90,5 +94,5 @@ outputs:
         gnocchi::db::mysql::allowed_hosts:
           - '%'
           - "%{hiera('mysql_bind_host')}"
-        gnocchi::auth::auth_region: 'regionOne'
+        gnocchi::auth::auth_region: {get_param: KeystoneRegion}
         gnocchi::auth::auth_tenant_name: 'service'