X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fcinder-api.yaml;h=b32c8185844fa9b26a907a30bd09bc60d2d9a44a;hb=1867b5408602813709359b5a34a1e7ea73ae7569;hp=7d197831dcba47376c472384b121d4fc9559efe7;hpb=11f3bde268f705cf2eb3ba26b338de4fd7e95ac3;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index 7d197831..b32c8185 100644
--- 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