X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fmanila-scheduler.yaml;h=474cc24f9bdf5e688b2467a970c85b52cce0f5aa;hb=b301d5edb7dd591d5a1deda41f09b1b42628486e;hp=a5122ba0bf9d7c162160daf9539ba7960b09106a;hpb=5af569abb6922efbb6fee8198d8cd7cc741e1499;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/manila-scheduler.yaml b/puppet/services/manila-scheduler.yaml
index a5122ba0..474cc24f 100644
--- a/puppet/services/manila-scheduler.yaml
+++ b/puppet/services/manila-scheduler.yaml
@@ -30,6 +30,9 @@ parameters:
     description: The password for the manila service account.
     type: string
     hidden: true
+  MonitoringSubscriptionManilaScheduler:
+    default: 'overcloud-manila-scheduler'
+    type: string
 
 resources:
   ManilaBase:
@@ -44,13 +47,13 @@ outputs:
     description: Role data for the Manila-scheduler role.
     value:
       service_name: manila_scheduler
+      monitoring_subscription: {get_param: MonitoringSubscriptionManilaScheduler}
       config_settings:
         map_merge:
           - get_attr: [ManilaBase, role_data, config_settings]
           - manila::compute::nova::nova_admin_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
             manila::compute::nova::nova_admin_password: {get_param: NovaPassword}
             manila::compute::nova::nova_admin_tenant_name: 'service'
-            manila::db::mysql::password: {get_param: ManilaPassword}
             manila::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
             manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, NeutronAdmin, uri]}
             manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
@@ -65,4 +68,3 @@ outputs:
                   - '/manila'
       step_config: |
         include ::tripleo::profile::base::manila::scheduler
-