Merge "Ignore hidden files in directories"

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

diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 7d19783..b32c818 100644 (file)
--- a/puppet/services/cinder-api.yaml
+++ b/puppet/services/cinder-api.yaml
@@ -91,6 +91,8 @@ outputs:
             cinder::config:
               DEFAULT/swift_catalog_info:
                 value: 'object-store:swift:internalURL'
+            # TODO(emilien) remove the next line when https://review.openstack.org/422915
+            # is merged.
             cinder::glance::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
             tripleo::profile::base::cinder::cinder_enable_db_purge: {get_param: CinderEnableDBPurge}
             tripleo.cinder_api.firewall_rules:
@@ -160,6 +162,3 @@ outputs:
         - name: Stop and disable cinder_api service (pre-upgrade not under httpd)
           tags: step2
           service: name=openstack-cinder-api state=stopped enabled=no
-        - name: Start cinder_api service (running under httpd)
-          tags: step6
-          service: name=httpd state=started