Browse Source

Merge "Adds a step0 for pre upgrade-init checks"

changes/09/417109/7
Jenkins 6 years ago committed by Gerrit Code Review
parent
commit
15c358de1c
  1. 6
      puppet/major_upgrade_steps.j2.yaml
  2. 3
      puppet/services/database/mysql.yaml
  3. 4
      puppet/services/pacemaker/database/mysql.yaml
  4. 8
      puppet/services/tripleo-packages.yaml

6
puppet/major_upgrade_steps.j2.yaml

@ -19,7 +19,7 @@ resources:
# Upgrade Steps for all roles
# FIXME(shardy): would be nice to make the number of steps configurable
{% for step in range(1, 8) %}
{% for step in range(0, 8) %}
{% for role in roles %}
# Step {{step}} resources
{{role.name}}UpgradeConfig_Step{{step}}:
@ -28,7 +28,7 @@ resources:
# serialization, but the event output is easier to follow if we
# do, and there should be minimal performance hit (creating the
# config is cheap compared to the time to apply the deployment).
{% if step > 1 %}
{% if step > 0 %}
depends_on:
{% for dep in roles %}
- {{dep.name}}Upgrade_Step{{step -1}}
@ -40,7 +40,7 @@ resources:
{{role.name}}Upgrade_Step{{step}}:
type: OS::Heat::StructuredDeploymentGroup
{% if step > 1 %}
{% if step > 0 %}
depends_on:
{% for dep in roles %}
- {{dep.name}}Upgrade_Step{{step -1}}

3
puppet/services/database/mysql.yaml

@ -95,6 +95,9 @@ outputs:
step_config: |
include ::tripleo::profile::base::database::mysql
upgrade_tasks:
- name: Check for galera root password
tags: step0
file: path=/root/.my.cnf state=file
- name: Stop service
tags: step2
service: name=mariadb state=stopped

4
puppet/services/pacemaker/database/mysql.yaml

@ -53,3 +53,7 @@ outputs:
get_param: [ServiceNetMap, MysqlNetwork]
step_config: |
include ::tripleo::profile::pacemaker::database::mysql
upgrade_tasks:
- name: Check for galera root password
tags: step0
file: path=/root/.my.cnf state=file

8
puppet/services/tripleo-packages.yaml

@ -33,6 +33,14 @@ outputs:
step_config: |
include ::tripleo::packages
upgrade_tasks:
- name: Check yum for rpm-python present
tags: step0
yum: "name=rpm-python state=present"
register: rpm_python_check
- name: Fail when rpm-python wasn't present
fail: msg="rpm-python package was not present before this run! Check environment before re-running"
when: rpm_python_check.changed != false
tags: step0
- name: Update all packages
tags: step3
yum: name=* state=latest

Loading…
Cancel
Save