Merge "Move setting of Glance's keystone region to API profile"

[apex-tripleo-heat-templates.git] / puppet / services / glance-api.yaml

diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index 89e6ee0..bb14546 100644 (file)
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -9,6 +9,9 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  CephClientUserName:
+    default: openstack
+    type: string
   Debug:
     default: ''
     description: Set to True to enable debugging on all services.
@@ -36,6 +39,9 @@ parameters:
     default: 0
     description: Number of workers for Glance service.
     type: number
+  GlanceRbdPoolName:
+    default: images
+    type: string
   RabbitPassword:
     description: The password for RabbitMQ
     type: string
@@ -54,11 +60,16 @@ parameters:
         Rabbit client subscriber parameter to specify
         an SSL connection to the RabbitMQ host.
     type: string
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
 
 outputs:
   role_data:
     description: Role data for the Glance API role.
     value:
+      service_name: glance_api
       config_settings:
         glance::api::database_connection:
           list_join:
@@ -78,6 +89,7 @@ outputs:
             params:
               REGISTRY_HOST: {get_param: [EndpointMap, GlanceRegistryInternal, host]}
         glance::api::keystone_password: {get_param: GlancePassword}
+        glance::api::enable_proxy_headers_parsing: true
         glance::api::debug: {get_param: Debug}
         glance::api::workers: {get_param: GlanceWorkers}
         glance_notifier_strategy: {get_param: GlanceNotifierStrategy}
@@ -85,6 +97,9 @@ outputs:
         glance::backend::swift::swift_store_auth_address: {get_param: [EndpointMap, KeystoneInternal, uri] }
         glance::backend::swift::swift_store_user: service:glance
         glance::backend::swift::swift_store_key: {get_param: GlancePassword}
+        glance::backend::swift::swift_store_create_container_on_put: true
+        glance::backend::rbd::rbd_store_pool: {get_param: GlanceRbdPoolName}
+        glance::backend::rbd::rbd_store_user: {get_param: CephClientUserName}
         glance_backend: {get_param: GlanceBackend}
         glance::db::mysql::password: {get_param: GlancePassword}
         glance::notify::rabbitmq::rabbit_userid: {get_param: RabbitUserName}
@@ -95,5 +110,18 @@ outputs:
         glance::keystone::auth::internal_url: {get_param: [EndpointMap, GlanceInternal, uri]}
         glance::keystone::auth::admin_url: {get_param: [EndpointMap, GlanceAdmin, uri]}
         glance::keystone::auth::password: {get_param: GlancePassword }
+        glance::keystone::auth::region: {get_param: KeystoneRegion}
+        glance::registry::db::database_db_max_retries: -1
+        glance::registry::db::database_max_retries: -1
+        tripleo.glance_api.firewall_rules:
+          '112 glance_api':
+            dport:
+              - 9292
+              - 13292
+        glance::keystone::auth::tenant: 'service'
+        glance::api::keystone_tenant: 'service'
+        glance::api::pipeline: 'keystone'
+        glance::api::show_image_direct_url: true
+
       step_config: |
         include ::tripleo::profile::base::glance::api