Merge "Add IronicInspector settings to the network map"

[apex-tripleo-heat-templates.git] / puppet / services / manila-base.yaml

diff --git a/puppet/services/manila-base.yaml b/puppet/services/manila-base.yaml
index d228577..a299fff 100644 (file)
--- a/puppet/services/manila-base.yaml
+++ b/puppet/services/manila-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: pike
 
 description: >
   Openstack Manila base service. Shared by manila-api/scheduler/share services
@@ -13,6 +13,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -40,6 +48,10 @@ parameters:
     default: 5672
     description: Set rabbit subscriber port, change this if using SSL
     type: number
+  ManilaPassword:
+    description: The password for the manila service account.
+    type: string
+    hidden: true
 
 outputs:
   role_data:
@@ -54,3 +66,22 @@ outputs:
         manila::debug: {get_param: Debug}
         manila::db::database_db_max_retries: -1
         manila::db::database_max_retries: -1
+        manila::sql_connection:
+          make_url:
+            scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
+            username: manila
+            password: {get_param: ManilaPassword}
+            host: {get_param: [EndpointMap, MysqlInternal, host]}
+            path: /manila
+            query:
+              read_default_file: /etc/my.cnf.d/tripleo.cnf
+              read_default_group: tripleo
+      service_config_settings:
+        mysql:
+          manila::db::mysql::password: {get_param: ManilaPassword}
+          manila::db::mysql::user: manila
+          manila::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          manila::db::mysql::dbname: manila
+          manila::db::mysql::allowed_hosts:
+            - '%'
+            - "%{hiera('mysql_bind_host')}"