openstack/openstack-ansible
Code Issues Proposed changes

Merge "Run haproxy playbook earlier within upgrade script"

Browse Source
This commit is contained in:
Jenkins
2016-09-20 13:37:17 +00:00
committed by Gerrit Code Review
parent d24d0ce5a6 1926e6e11e
commit bcb517c7d3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/run-upgrade.sh
View File

@@ -158,6 +158,7 @@ function main {
RUN_TASKS+=("setup-hosts.yml --limit '!galera_all'") RUN_TASKS+=("setup-hosts.yml --limit '!galera_all'")
# add new container config to galera containers but don't restart # add new container config to galera containers but don't restart
RUN_TASKS+=("lxc-containers-create.yml -e 'lxc_container_allow_restarts=false' --limit galera_all") RUN_TASKS+=("lxc-containers-create.yml -e 'lxc_container_allow_restarts=false' --limit galera_all")
RUN_TASKS+=("haproxy-install.yml")
# rebuild the repo servers # rebuild the repo servers
RUN_TASKS+=("repo-install.yml") RUN_TASKS+=("repo-install.yml")
RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/old-hostname-compatibility.yml") RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/old-hostname-compatibility.yml")
@@ -166,7 +167,6 @@ function main {
# explicitly perform controlled galera cluster restart # explicitly perform controlled galera cluster restart
RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/galera-cluster-rolling-restart.yml") RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/galera-cluster-rolling-restart.yml")
# individually run each of the remaining plays from setup-infrastructure # individually run each of the remaining plays from setup-infrastructure
RUN_TASKS+=("haproxy-install.yml")
RUN_TASKS+=("memcached-install.yml") RUN_TASKS+=("memcached-install.yml")
RUN_TASKS+=("rabbitmq-install.yml -e 'rabbitmq_upgrade=true'") RUN_TASKS+=("rabbitmq-install.yml -e 'rabbitmq_upgrade=true'")
RUN_TASKS+=("utility-install.yml") RUN_TASKS+=("utility-install.yml")