Merge "Add deployed-server backwards compatible template"

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

diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml
index c45582d..914c158 100644 (file)
--- a/puppet/services/glance-registry.yaml
+++ b/puppet/services/glance-registry.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Glance Registry service configured with Puppet
@@ -76,6 +76,8 @@ outputs:
                   - '@'
                   - {get_param: [EndpointMap, MysqlInternal, host]}
                   - '/glance'
+                  - '?bind_address='
+                  - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
             glance::registry::authtoken::password: {get_param: GlancePassword}
             glance::registry::authtoken::project_name: 'service'
             glance::registry::pipeline: 'keystone'
@@ -98,3 +100,10 @@ outputs:
         include ::tripleo::profile::base::glance::registry
       service_config_settings:
           get_attr: [GlanceBase, role_data, config_settings]
+      upgrade_tasks:
+        - name: Stop glance_registry service
+          tags: step2
+          service: name=openstack-glance-registry state=stopped
+        - name: Start glance_registry service
+          tags: step6
+          service: name=openstack-glance-registry state=started