extraconfig/services/openshift-master.yaml is not idempotent

[John Trowbridge]

Description of problem:
Openshift deployment via scenario009 fails when re-running the overcloud deploy command with:

TASK [generate openshift playbook] *********************************************
Thursday 30 August 2018 15:59:27 -0400 (0:00:00.050) 0:02:30.779 *******
fatal: [undercloud]: FAILED! => {"msg": "The task includes an option with an undefined variable. The error was: 'openshift_upgrade' is undefined\n\nThe error appears to have been in '/var/lib/mistral/openshift/external_deploy_steps_tasks.yaml': line 124, column 5, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n openshift_upgrade_playbook_path: /usr/share/ansible/openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_9/upgrade.yml\n - copy:\n ^ here\n"}

Steps to Reproduce:
1. Deploy scenario009
2. Make sure deployment is successful
3. Re-run the same overcloud deploy command

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/605796

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/608658
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=73c3cd41813606cd715c9193d825d64dcf2c3b40
Submitter: Zuul
Branch: master

commit 73c3cd41813606cd715c9193d825d64dcf2c3b40
Author: Martin André <email address hidden>
Date: Mon Oct 8 14:26:18 2018 +0200

    Fix update tasks for openshift

    While introducing the openshift-node service in 7373adc72e, some code
    was moved around and that broke the OpenShift external_deploy_task
    playbook in the case of a stack update due to undefined ansible
    variable.

    Rename the new_masters var into new_master_nodes and introduce the
    has_new_nodes boolean var that indicates there is at least one new node
    in the deployment.

    Related-Bug: 1794824

    Change-Id: I2f386b5507836deda0816616dd7add8a0b53dfd3

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: stable/rocky
Review: https://review.openstack.org/611241

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/611241
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=2cd338a7e292744b785e6cc07450691cf14b0fc2
Submitter: Zuul
Branch: stable/rocky

commit 2cd338a7e292744b785e6cc07450691cf14b0fc2
Author: Martin André <email address hidden>
Date: Mon Oct 8 14:26:18 2018 +0200

    Fix update tasks for openshift

    While introducing the openshift-node service in 7373adc72e, some code
    was moved around and that broke the OpenShift external_deploy_task
    playbook in the case of a stack update due to undefined ansible
    variable.

    Rename the new_masters var into new_master_nodes and introduce the
    has_new_nodes boolean var that indicates there is at least one new node
    in the deployment.

    Related-Bug: 1794824

    Change-Id: I2f386b5507836deda0816616dd7add8a0b53dfd3
    (cherry picked from commit 73c3cd41813606cd715c9193d825d64dcf2c3b40)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/605796
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=d295cd94b82218f62c4b564f0a3a76cc04cba549
Submitter: Zuul
Branch: master

commit d295cd94b82218f62c4b564f0a3a76cc04cba549
Author: trown <email address hidden>
Date: Thu Sep 27 11:41:24 2018 -0400

    Make openshift-master service idempotent

    The openshift-master service will fail any time it is used with a
    stack update. This is because the openshift_upgrade var is not
    defined, but is checked whenever tripleo_stack_action == 'UPDATE'.

    This patch adds a check for openshift_upgrade being defined before
    checking if it is True.

    Closes-Bug: 1794824
    Change-Id: I3a598724154a3242b777eefed9304300c45d8c29

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/rocky
Review: https://review.openstack.org/618638

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/618638
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=7a254d1d90e793ad3112995137cf46d507985b87
Submitter: Zuul
Branch: stable/rocky

commit 7a254d1d90e793ad3112995137cf46d507985b87
Author: trown <email address hidden>
Date: Thu Sep 27 11:41:24 2018 -0400

    Make openshift-master service idempotent

    The openshift-master service will fail any time it is used with a
    stack update. This is because the openshift_upgrade var is not
    defined, but is checked whenever tripleo_stack_action == 'UPDATE'.

    This patch adds a check for openshift_upgrade being defined before
    checking if it is True.

    Closes-Bug: 1794824
    Change-Id: I3a598724154a3242b777eefed9304300c45d8c29
    (cherry picked from commit d295cd94b82218f62c4b564f0a3a76cc04cba549)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 10.2.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 9.2.0 release.