X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fnova-vncproxy.yaml;h=0ec5de68dfa640484e68d4eb8cbf47e45f111099;hb=d6837ea4a62ec74c4b06901c257fe4d6f4bea73c;hp=8fb07d57ac95d9462dc008fc0ba624976d9dc0c9;hpb=aa71f16a69f063f9a23377271c7cd17a0c4195cc;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/nova-vncproxy.yaml b/puppet/services/pacemaker/nova-vncproxy.yaml
index 8fb07d57..0ec5de68 100644
--- a/puppet/services/pacemaker/nova-vncproxy.yaml
+++ b/puppet/services/pacemaker/nova-vncproxy.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Nova Vncproxy 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
@@ -15,13 +24,16 @@ resources:
   NovaVncproxyBase:
     type: ../nova-vncproxy.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Nova Vncproxy role.
     value:
-      service_name: nova-vncproxy
+      service_name: nova_vncproxy
+      monitoring_subscription: {get_attr: [NovaVncproxyBase, role_data, monitoring_subscription]}
       config_settings:
         map_merge:
           - get_attr: [NovaVncproxyBase, role_data, config_settings]