Unset Keystone public_endpoint

[apex-tripleo-heat-templates.git] / puppet / services / keystone.yaml

diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 45531ab..6e94e4c 100644 (file)
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -84,6 +84,9 @@ parameters:
     type: string
     description: Set the number of workers for keystone::wsgi::apache
     default: '"%{::processorcount}"'
+  MonitoringSubscriptionKeystone:
+    default: 'overcloud-kestone'
+    type: string
 
 resources:
 
@@ -99,6 +102,7 @@ outputs:
     description: Role data for the Keystone role.
     value:
       service_name: keystone
+      monitoring_subscription: {get_param: MonitoringSubscriptionKeystone}
       config_settings:
       config_settings:
         map_merge:
@@ -132,7 +136,6 @@ outputs:
             keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
             keystone::endpoint::region: {get_param: KeystoneRegion}
             keystone_enable_db_purge: {get_param: KeystoneEnableDBPurge}
-            keystone::public_endpoint: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
             keystone::db::mysql::user: keystone
             keystone::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
             keystone::db::mysql::dbname: keystone