Merge the tip of origin/release/proposed/2019.2.0 into origin/release/2019.2.0
679e050 Add check for 'update_cells'
f1a6533 Execute haproxy state earlier in control upgrade
5e9fc06 Refresh haproxy config during galera upgrade
Change-Id: I1474dee95a209c6670f1e4c2027386aa021803cf
diff --git a/openstack-control-upgrade.groovy b/openstack-control-upgrade.groovy
index 5929390..14f4c06 100644
--- a/openstack-control-upgrade.groovy
+++ b/openstack-control-upgrade.groovy
@@ -151,6 +151,8 @@
"Above you can find detailed info this pipeline will execute.\nThe info provides brief description of each stage, actions that will be performed and service/workload impact during each stage.\nPlease read it carefully.", "yellow")
}
+ common.infoMsg("Refreshing haproxy config for mysql proxies")
+ salt.enforceState(env, 'I@haproxy:proxy:listen:mysql_cluster', ['haproxy.proxy'])
for (target in upgradeTargets){
common.stageWrapper(upgradeStageMap, "Pre upgrade", target, interactive) {
diff --git a/upgrade-mcp-release.groovy b/upgrade-mcp-release.groovy
index a6e5358..93389a0 100644
--- a/upgrade-mcp-release.groovy
+++ b/upgrade-mcp-release.groovy
@@ -247,6 +247,14 @@
}
}
+def check_34645(String cluster_name) {
+ def updatecellsPillar = salt.getPillar(venvPepper, 'I@nova:controller', 'nova:controller:update_cells').get("return")[0].values()[0]
+ if (updatecellsPillar.toString().toLowerCase() == 'false') {
+ error('Update cells disabled.\n' +
+ 'See https://docs.mirantis.com/mcp/q4-18/mcp-operations-guide/openstack-operations/disable-nova-cell-mapping.html')
+ }
+}
+
def check_35705(String cluster_name) {
def galeracheckpasswordPillar = salt.getPillar(venvPepper, 'I@salt:master', '_param:galera_clustercheck_password').get("return")[0].values()[0]
if (galeracheckpasswordPillar == '' || galeracheckpasswordPillar == 'null' || galeracheckpasswordPillar == null) {
@@ -727,6 +735,7 @@
fullRefreshOneByOne(venvPepper, allMinions)
check_34406(cluster_name)
+ check_34645(cluster_name)
check_35705(cluster_name)
check_35884(cluster_name)
check_36461(cluster_name)