From dd9c8d6e9c5e28ee2267bfb7d58de554988451b2 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 25 Aug 2016 09:22:08 -0400 Subject: Mv ceilo, aodh, and gnocchi out of controller.yaml This patch moves the remaining hiera settings for Ceilometer, Aodh, and Gnocchi out of controller.yaml and into the respective composable services. Change-Id: I01377aa5c121ecbb4a96b4f0525924c7bbf12198 Related-bug: #1604414 --- puppet/services/gnocchi-api.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'puppet/services/gnocchi-api.yaml') diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml index cbf7e218..d21e5b2b 100644 --- a/puppet/services/gnocchi-api.yaml +++ b/puppet/services/gnocchi-api.yaml @@ -69,5 +69,17 @@ outputs: gnocchi::keystone::authtoken::project_name: 'service' gnocchi::wsgi::apache::ssl: false tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend} + # NOTE: bind IP is found in Heat replacing the network name with the + # local node IP for the given network; replacement examples + # (eg. for internal_api): + # internal_api -> IP + # internal_api_uri -> [IP] + # internal_api_subnet - > IP/CIDR + gnocchi::wsgi::apache::bind_host: {get_param: [ServiceNetMap, GnocchiApiNetwork]} + gnocchi::api::host: {get_param: [ServiceNetMap, GnocchiApiNetwork]} + + gnocchi::api::keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} + gnocchi::api::keystone_identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} + gnocchi::storage::swift::swift_authurl: {get_param: [EndpointMap, KeystoneInternal, uri]} step_config: | include ::tripleo::profile::base::gnocchi::api -- cgit 1.2.3-korg