Merge "composable neutron server"

[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 a1ab1a2..89e6ee0 100644 (file)
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -9,9 +9,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  MysqlVirtualIPUri:
-    type: string
-    default: ''
   Debug:
     default: ''
     description: Set to True to enable debugging on all services.
@@ -47,6 +44,10 @@ parameters:
     default: guest
     description: The username for RabbitMQ
     type: string
+  RabbitClientPort:
+    default: 5672
+    description: Set rabbit subscriber port, change this if using SSL
+    type: number
   RabbitClientUseSSL:
     default: false
     description: >
@@ -59,13 +60,14 @@ outputs:
     description: Role data for the Glance API role.
     value:
       config_settings:
-        glance_dsn: &glance_dsn
+        glance::api::database_connection:
           list_join:
             - ''
-            - - 'mysql+pymysql://glance:'
+            - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+              - '://glance:'
               - {get_param: GlancePassword}
               - '@'
-              - {get_param: MysqlVirtualIPUri}
+              - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/glance'
         glance::api::bind_port: {get_param: [EndpointMap, GlanceInternal, port]}
         glance::api::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
@@ -80,14 +82,18 @@ outputs:
         glance::api::workers: {get_param: GlanceWorkers}
         glance_notifier_strategy: {get_param: GlanceNotifierStrategy}
         glance_log_file: {get_param: GlanceLogFile}
-        glance::api::database_connection: *glance_dsn
         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: {get_param: GlanceBackend}
         glance::db::mysql::password: {get_param: GlancePassword}
         glance::notify::rabbitmq::rabbit_userid: {get_param: RabbitUserName}
+        glance::notify::rabbitmq::rabbit_port: {get_param: RabbitClientPort}
         glance::notify::rabbitmq::rabbit_password: {get_param: RabbitPassword}
         glance::notify::rabbitmq::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
+        glance::keystone::auth::public_url: {get_param: [EndpointMap, GlancePublic, uri]}
+        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 }
       step_config: |
         include ::tripleo::profile::base::glance::api