X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=puppet%2Fservices%2Fmanila-scheduler.yaml;h=364a1a3de30911ee1fca1f586d9ed25fd6945aff;hb=8da5e1f7006d8128e83fe151da930dc5a670180d;hp=9ce90f0d03c07c836fda1317222209bde0b8b88e;hpb=3fccf25205d601fe1897456342160814f4cacc4f;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/manila-scheduler.yaml b/puppet/services/manila-scheduler.yaml
index 9ce90f0d..364a1a3d 100644
--- a/puppet/services/manila-scheduler.yaml
+++ b/puppet/services/manila-scheduler.yaml
@@ -1,9 +1,13 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Manila-scheduler service configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -28,7 +32,7 @@ parameters:
     type: json
   NovaPassword:
     type: string
-    description: The password for the nova service and db account, used by nova-api.
+    description: The password for the nova service and db account
     hidden: true
   NeutronPassword:
     description: The password for the neutron service and db account, used by neutron agents.
@@ -46,6 +50,7 @@ resources:
   ManilaBase:
     type: ./manila-base.yaml
     properties:
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
@@ -65,7 +70,7 @@ outputs:
             manila::compute::nova::nova_admin_password: {get_param: NovaPassword}
             manila::compute::nova::nova_admin_tenant_name: 'service'
             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_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
             manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
       step_config: |
         include ::tripleo::profile::base::manila::scheduler