X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=puppet%2Fservices%2Fpacemaker%2Fkeystone.yaml;h=908b9bbd2b87bd9a72671ea2002d19a061a9fc83;hb=f4ec754a4df333af597cc44208c3cc7114b47969;hp=8fcab15f4a7bf4665f44742861d46752f7e7c18a;hpb=2d4c27dac5efc33cdd547ad2bcdd88f28809052b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/keystone.yaml b/puppet/services/pacemaker/keystone.yaml
index 8fcab15f..908b9bbd 100644
--- a/puppet/services/pacemaker/keystone.yaml
+++ b/puppet/services/pacemaker/keystone.yaml
@@ -4,31 +4,42 @@ description: >
   OpenStack Keystone service with Pacemaker configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  MysqlVirtualIPUri:
-    type: string
-    default: ''
 
 resources:
 
   KeystoneServiceBase:
     type: ../keystone.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
-      MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
 
 outputs:
   role_data:
     description: Role data for the Keystone pacemaker role.
     value:
+      service_name: keystone
+      monitoring_subscription: {get_attr: [KeystoneServiceBase, role_data, monitoring_subscription]}
+      logging_source: {get_attr: [KeystoneServiceBase, role_data, logging_source]}
+      logging_groups: {get_attr: [KeystoneServiceBase, role_data, logging_groups]}
       config_settings:
         map_merge:
           - get_attr: [KeystoneServiceBase, role_data, config_settings]
-          #-
-          #  custom keystone hiera goes here if we need it!?
+          - keystone::manage_service: false
+            keystone::enabled: false
       step_config: |
         include ::tripleo::profile::pacemaker::keystone