FFU: Fix glance tasks

We need to register fact instead of reruning checks and we can't
hijack glance-api service with glance-registry removal. For the
removal of glance-registry we reintroduce the disabled service
to Controller role.

Change-Id: I38ab5a91b541e7e070f188ee73ef4c7dd7f65eaa

docker/services/glance-api.yaml

@@ -292,37 +292,27 @@ outputs:
         - name: Check if glance_api is deployed
           command: systemctl is-enabled --quiet openstack-glance-api
           ignore_errors: True
-          register: glance_api_enabled
+          register: glance_api_enabled_result
-        - name: Check if glance_registry is deployed
+          when:
-          command: systemctl is-enabled --quiet openstack-glance-registry
+            - step|int == 0
-          ignore_errors: True
+            - release == 'ocata'
-          register: glance_registry_enabled
+        - name: Set fact glance_api_enabled
+          set_fact:
+            glance_api_enabled: "{{ glance_api_enabled_result.rc == 0 }}"
+          when:
+            - step|int == 0
+            - release == 'ocata'
         - name: Stop openstack-glance-api
           service: name=openstack-glance-api state=stopped enabled=no
           when:
-            - step|int == 2
+            - step|int == 1
             - release == 'ocata'
-            - glance_api_enabled.rc == 0
+            - glance_api_enabled|bool
-        - name: Stop openstack-glance-registry
-          service: name=openstack-glance-registry state=stopped enabled=no
-          when:
-            - step|int == 2
-            - release == 'ocata'
-            - glance_registry_enabled.rc == 0
         - name: glance package update
-          yum:
+          yum: name=openstack-glance state=latest
-            name: '{{ package }}'
-            state: latest
           when:
             - step|int == 6
             - is_bootstrap_node|bool
-          loop_control:
-            loop_var: package
-          with_items:
-            - python-glance-store
-            - python-glanceclient
-            - openstack-glance
-            - python-glance
         - name: glance db sync
           command: glance-manage db_sync
           when:

puppet/services/disabled/glance-registry-disabled.yaml

@@ -40,3 +40,23 @@ outputs:
         - name: Stop and disable glance_registry service on upgrade
           when: step|int == 1
           service: name=openstack-glance-registry state=stopped enabled=no
+      fast_forward_upgrade_tasks:
+        - name: Check if glance_registry is deployed
+          command: systemctl is-enabled --quiet openstack-glance-registry
+          ignore_errors: True
+          register: glance_registry_enabled_result
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: Set fact glance_registry_enabled
+          set_fact:
+            glance_registry_enabled: "{{ glance_registry_enabled_result.rc == 0 }}"
+          when:
+            - step|int == 0
+            - release == 'ocata'
+        - name: Stop openstack-glance-registry
+          service: name=openstack-glance-registry state=stopped enabled=no
+          when:
+            - step|int == 1
+            - release == 'ocata'
+            - glance_registry_enabled|bool

roles/Controller.yaml

@@ -73,6 +73,7 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
+    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd

roles/ControllerAllNovaStandalone.yaml

@@ -50,6 +50,7 @@
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::Ipsec
     - OS::TripleO::Services::GlanceApi
+    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd

roles/ControllerNoCeph.yaml

@@ -66,6 +66,7 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
+    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd

roles/ControllerNovaStandalone.yaml

@@ -58,6 +58,7 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
+    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd

roles/ControllerOpenstack.yaml

@@ -55,6 +55,7 @@
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::Ipsec
     - OS::TripleO::Services::GlanceApi
+    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd

roles/ControllerStorageNfs.yaml

@@ -67,6 +67,7 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
+    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd

roles_data.yaml

@@ -76,6 +76,7 @@
     - OS::TripleO::Services::ExternalSwiftProxy
     - OS::TripleO::Services::Fluentd
     - OS::TripleO::Services::GlanceApi
+    - OS::TripleO::Services::GlanceRegistry
     - OS::TripleO::Services::GnocchiApi
     - OS::TripleO::Services::GnocchiMetricd
     - OS::TripleO::Services::GnocchiStatsd