X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fbarbican-api.yaml;h=000a744c78edeca3e104499d4230dc53526432ea;hb=8bf04682013472dcc696dde7dc7b5e48d33bb7bc;hp=cf57680c132542b10eedc983b3e3aa88e356fb85;hpb=cac8c7d28584a56321dbaf8b0ca5fd6e8986deb2;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml
index cf57680c..000a744c 100644
--- a/puppet/services/barbican-api.yaml
+++ b/puppet/services/barbican-api.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Barbican API service configured with Puppet
@@ -24,7 +24,7 @@ parameters:
     hidden: true
   BarbicanWorkers:
     description: Set the number of workers for barbican::wsgi::apache
-    default: '"%{::processorcount}"'
+    default: '%{::processorcount}'
     type: string
   Debug:
     default: ''
@@ -52,6 +52,9 @@ parameters:
     default: guest
     description: The username for RabbitMQ
     type: string
+  EnableInternalTLS:
+    type: boolean
+    default: false
 
 resources:
 
@@ -85,12 +88,12 @@ outputs:
             barbican::api::rabbit_heartbeat_timeout_threshold: 60
             barbican::api::service_name: 'httpd'
             barbican::wsgi::apache::bind_host: {get_param: [ServiceNetMap, BarbicanApiNetwork]}
-            barbican::wsgi::apache::ssl: false
+            barbican::wsgi::apache::ssl:  {get_param: EnableInternalTLS}
             barbican::wsgi::apache::workers: {get_param: BarbicanWorkers}
             barbican::wsgi::apache::servername:
               str_replace:
                 template:
-                  '"%{::fqdn_$NETWORK}"'
+                  "%{hiera('fqdn_$NETWORK')}"
                 params:
                   $NETWORK: {get_param: [ServiceNetMap, BarbicanApiNetwork]}
             barbican::db::database_connection:
@@ -102,6 +105,8 @@ outputs:
                   - '@'
                   - {get_param: [EndpointMap, MysqlInternal, host]}
                   - '/barbican'
+                  - '?bind_address='
+                  - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
             tripleo.barbican_api.firewall_rules:
               '117 barbican':
                 dport:
@@ -125,3 +130,17 @@ outputs:
           barbican::keystone::auth::password: {get_param: BarbicanPassword}
           barbican::keystone::auth::region: {get_param: KeystoneRegion}
           barbican::keystone::auth::tenant: 'service'
+        nova_compute:
+          nova::compute::keymgr_api_class: >
+            castellan.key_manager.barbican_key_manager.BarbicanKeyManager
+          nova::compute::barbican_endpoint:
+            get_param: [EndpointMap, BarbicanInternal, uri]
+          nova::compute::barbican_auth_endpoint:
+            get_param: [EndpointMap, KeystoneV3Internal, uri]
+        cinder_api:
+          cinder::api::keymgr_api_class: >
+            castellan.key_manager.barbican_key_manager.BarbicanKeyManager
+          cinder::api::keymgr_encryption_api_url:
+            get_param: [EndpointMap, BarbicanInternal, uri]
+          cinder::api::keymgr_encryption_auth_url:
+            get_param: [EndpointMap, KeystoneV3Internal, uri]