Merge "Deploy versionless keystone endpoints (for keystone only)" into stable/ocata

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

diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml
index fefb322..7082139 100644 (file)
--- a/puppet/services/ec2-api.yaml
+++ b/puppet/services/ec2-api.yaml
@@ -118,16 +118,21 @@ outputs:
       upgrade_tasks:
         - name: Check if ec2-api is deployed
           command: systemctl is-enabled openstack-ec2-api
-          tags: step0,validation
+          tags: common
           ignore_errors: True
-          register: ec2-api_enabled
+          register: ec2_api_enabled
         - name: "PreUpgrade step0,validation: Check if openstack-ec2-api is running"
           shell: >
             /usr/bin/systemctl show 'openstack-ec2-api' --property ActiveState |
             grep '\bactive\b'
-          when: ec2-api_enabled.rc == 0
+          when: ec2_api_enabled.rc == 0
           tags: step0,validation
         - name: Stop openstack-ec2-api service
           tags: step1
+          when: ec2_api_enabled.rc == 0
           service: name=openstack-ec2-api state=stopped
+        - name: Install openstack-ec2-api package if it was disabled
+          tags: step3
+          yum: name=openstack-ec2-api state=latest
+          when: ec2_api_enabled.rc != 0