openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Correct erroneous upgrade tasks."

Browse Source
This commit is contained in:
Zuul 2018-01-17 18:39:56 +00:00 committed by Gerrit Code Review
commit 3ab3ff3a6f
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/services/ceph-ansible/ceph-osd.yaml
View File

@ -57,7 +57,8 @@ outputs:
service_name: ceph_osd service_name: ceph_osd
upgrade_tasks: upgrade_tasks:
- name: Check legacy Ceph hieradata - name: Check legacy Ceph hieradata
tags: step0,validation tags: validation
when: step|int == 0
shell: test "nil" == "$(hiera -c /etc/puppet/hiera.yaml ceph::profile::params::osds)" shell: test "nil" == "$(hiera -c /etc/puppet/hiera.yaml ceph::profile::params::osds)"
puppet_config: puppet_config:
config_image: '' config_image: ''

2
docker/services/ironic-inspector.yaml
View File

@ -171,7 +171,7 @@ outputs:
/var/log/containers/ironic-inspector. /var/log/containers/ironic-inspector.
ignore_errors: true ignore_errors: true
upgrade_tasks: upgrade_tasks:
- when: step|int ==2 - when: step|int == 2
block: block:
- name: Stop and disable ironic_inspector service - name: Stop and disable ironic_inspector service
service: name=openstack-ironic-inspector state=stopped enabled=no service: name=openstack-ironic-inspector state=stopped enabled=no

7
docker/services/ovn-metadata.yaml
View File

@ -146,9 +146,8 @@ outputs:
register: networking_ovn_metadata_agent_enabled register: networking_ovn_metadata_agent_enabled
- name: "PreUpgrade step0,validation: Check service networking-ovn-metadata-agent is running" - name: "PreUpgrade step0,validation: Check service networking-ovn-metadata-agent is running"
command: systemctl is-active --quiet networking-ovn-metadata-agent command: systemctl is-active --quiet networking-ovn-metadata-agent
when: networking_ovn_metadata_agent_enabled.rc == 0 when: (networking_ovn_metadata_agent_enabled.rc == 0) and (step|int == 0)
tags: step0,validation tags: validation
- name: Stop and disable networking_ovn_metadata service - name: Stop and disable networking_ovn_metadata service
tags: step2 when: (networking_ovn_metadata_agent_enabled.rc == 0) and (step|int == 2)
when: networking_ovn_metadata_agent_enabled.rc == 0
service: name=networking-ovn-metadata-agent state=stopped enabled=no service: name=networking-ovn-metadata-agent state=stopped enabled=no

2
puppet/services/docker-registry.yaml
View File

@ -45,5 +45,5 @@ outputs:
include ::tripleo::profile::base::docker_registry include ::tripleo::profile::base::docker_registry
upgrade_tasks: upgrade_tasks:
- name: Install docker packages on upgrade if missing - name: Install docker packages on upgrade if missing
tags: step3 when: step|int == 3
yum: name=docker-distribution state=latest yum: name=docker-distribution state=latest

7
puppet/services/ovn-metadata.yaml
View File

@ -115,9 +115,8 @@ outputs:
register: networking_ovn_metadata_agent_enabled register: networking_ovn_metadata_agent_enabled
- name: "PreUpgrade step0,validation: Check service networking-ovn-metadata-agent is running" - name: "PreUpgrade step0,validation: Check service networking-ovn-metadata-agent is running"
shell: /usr/bin/systemctl show 'networking-ovn-metadata-agent' --property ActiveState | grep '\bactive\b' shell: /usr/bin/systemctl show 'networking-ovn-metadata-agent' --property ActiveState | grep '\bactive\b'
when: networking_ovn_metadata_agent_enabled.rc == 0 when: (networking_ovn_metadata_agent_enabled.rc == 0) and (step|int == 0)
tags: step0,validation tags: validation
- name: Stop networking_ovn_metadata service - name: Stop networking_ovn_metadata service
tags: step1 when: (neutron_metadata_agent_enabled.rc == 0) and (step|int == 1)
when: neutron_metadata_agent_enabled.rc == 0
service: name=networking-ovn-metadata-agent state=stopped service: name=networking-ovn-metadata-agent state=stopped