Merge "Clarify horizon allowed hosts setting"

[apex-tripleo-heat-templates.git] / puppet / services / pacemaker / cinder-backup.yaml

diff --git a/puppet/services/pacemaker/cinder-backup.yaml b/puppet/services/pacemaker/cinder-backup.yaml
index 706717e..2ebc768 100644 (file)
--- a/puppet/services/pacemaker/cinder-backup.yaml
+++ b/puppet/services/pacemaker/cinder-backup.yaml
@@ -16,6 +16,15 @@ parameters:
   CephClientUserName:
     default: openstack
     type: string
+  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
@@ -27,6 +36,8 @@ resources:
   CinderBackupBase:
     type: ../cinder-backup.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
       CinderBackupBackend: {get_param: CinderBackupBackend}
       CinderBackupRbdPoolName: {get_param: CinderBackupRbdPoolName}
@@ -37,6 +48,7 @@ outputs:
     description: Role data for the Cinder Backup role.
     value:
       service_name: cinder_backup
+      monitoring_subscription: {get_attr: [CinderBackupBase, role_data, monitoring_subscription]}
       config_settings:
         map_merge:
           - get_attr: [CinderBackupBase, role_data, config_settings]