X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=puppet%2Fservices%2Fpacemaker%2Fglance-registry.yaml;h=41f89fddaf54fcf70c03bffee87151d891d9d4bb;hb=52310a22439bce232243edf6c417c729dd2fe13f;hp=393fbaafc8379d0d4f65e4edc7669e41201691cc;hpb=c7d996765ba86d245fb2a4f0ade01142689aafb0;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/glance-registry.yaml b/puppet/services/pacemaker/glance-registry.yaml
index 393fbaaf..41f89fdd 100644
--- a/puppet/services/pacemaker/glance-registry.yaml
+++ b/puppet/services/pacemaker/glance-registry.yaml
@@ -4,27 +4,38 @@ description: >
   OpenStack Glance Registry 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:
 
   GlanceRegistryBase:
     type: ../glance-registry.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 Glance role.
     value:
+      service_name: glance_registry
+      monitoring_subscription: {get_attr: [GlanceRegistryBase, role_data, monitoring_subscription]}
+      logging_source: {get_attr: [GlanceRegistryBase, role_data, logging_source]}
+      logging_groups: {get_attr: [GlanceRegistryBase, role_data, logging_groups]}
       config_settings:
         map_merge:
           - get_attr: [GlanceRegistryBase, role_data, config_settings]