openstack/tripleo-heat-templates
Code Issues Proposed changes

FFU: Fix glance tasks

Browse Source 
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
This commit is contained in:
Lukas Bezdicka 2018-02-26 15:24:20 +01:00 committed by Athlan-Guyot sofer
parent a197218d60
commit 9765f8d225
9 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
docker/services/glance-api.yaml
View File

@ -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
- name: Check if glance_registry is deployed
command: systemctl is-enabled --quiet openstack-glance-registry
ignore_errors: True
register: glance_registry_enabled
register: glance_api_enabled_result
when:
- step|int == 0
- release == 'ocata'
- 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
- 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
- glance_api_enabled|bool
- name: glance package update
yum:
name: '{{ package }}'
state: latest
yum: name=openstack-glance 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:

20
puppet/services/disabled/glance-registry-disabled.yaml
View File

@ -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

1
roles/Controller.yaml
View File

@ -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

1
roles/ControllerAllNovaStandalone.yaml
View File

@ -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

1
roles/ControllerNoCeph.yaml
View File

@ -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

1
roles/ControllerNovaStandalone.yaml
View File

@ -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

1
roles/ControllerOpenstack.yaml
View File

@ -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

1
roles/ControllerStorageNfs.yaml
View File

@ -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

1
roles_data.yaml
View File

@ -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