From 03de9e0fc7f4fc50a00db5d547413e26cf0780dd Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Wed, 30 Aug 2017 10:24:57 -0400 Subject: [PATCH] Ensure we use uwsgi for everything In the pike release we migrated everything to use uwsgi. There is no need to force everything back to eventlet. This was necessary when pike was master because in ocata we used eventlet. We don't want to switch deployment mechanisms in an upgrade. But now that pike is base we don't need to have any of these since everything is consistent on both sides of the upgrade. Depends-On: I066f5f87ff22d7da2e3814f8c2de75f2af625d2b Change-Id: Ib504ab21dfc5e32eb3f73f57d636981963e20520 --- devstack.local.conf.target | 4 ---- grenade.sh | 12 +----------- projects/30_swift/upgrade.sh | 2 +- projects/40_glance/upgrade.sh | 2 +- projects/60_nova/upgrade.sh | 6 +++--- projects/70_cinder/upgrade.sh | 4 ++-- 6 files changed, 8 insertions(+), 22 deletions(-) diff --git a/devstack.local.conf.target b/devstack.local.conf.target index 7a24d5b7..5b2865d8 100644 --- a/devstack.local.conf.target +++ b/devstack.local.conf.target @@ -29,7 +29,3 @@ VOLUME_BACKING_FILE_SIZE=10000M enable_service s-account s-container s-object s-proxy SWIFT_HASH=8213897fads879789asdf789 SWIFT_REPLICAS=1 - -# because this was the default in ocata, remove after pike has -# shipped. -WSGI_MODE="mod_wsgi" \ No newline at end of file diff --git a/grenade.sh b/grenade.sh index 70f7ffc4..4bd23ffa 100755 --- a/grenade.sh +++ b/grenade.sh @@ -219,16 +219,6 @@ load_settings # isn't run there. This has to be run after load_settings because # plugins might change the service list during this phase. -# Make sure we use the same configurations across base and target -# by being explicit. Nova, Cinder, Keystone should use Apache2/mod_wsgi -# we should revisit these in Queens -devstack_localrc base "WSGI_MODE=mod_wsgi" -devstack_localrc target "WSGI_MODE=mod_wsgi" -devstack_localrc base "NOVA_USE_MOD_WSGI=False" -devstack_localrc target "NOVA_USE_MOD_WSGI=False" -devstack_localrc base "CINDER_USE_MOD_WSGI=False" -devstack_localrc target "CINDER_USE_MOD_WSGI=False" - # Nova should use singleconductor as Grenade doesn't # setup multi-cell rabbit for now devstack_localrc base "CELLSV2_SETUP=singleconductor" @@ -260,7 +250,7 @@ if [[ "$RUN_BASE" == "True" ]]; then # CELLSV2_SETUP, the default devstack assumes "superconductor" and fails. if # we don't set WSGI_MODE, cinder fails to glance as the glance url is not # set up correctly - export SUB_NODE_ENV_VARS="WSGI_MODE=mod_wsgi CELLSV2_SETUP=singleconductor" + export SUB_NODE_ENV_VARS="CELLSV2_SETUP=singleconductor" sed -i 's/stdbuf/$SUB_NODE_ENV_VARS stdbuf/' ./post-stack.sh cat ./post-stack.sh diff --git a/projects/30_swift/upgrade.sh b/projects/30_swift/upgrade.sh index 629037c5..fa429b67 100755 --- a/projects/30_swift/upgrade.sh +++ b/projects/30_swift/upgrade.sh @@ -76,7 +76,7 @@ fi start_swift # Don't succeed unless the services come up -ensure_services_started swift-object-server swift-proxy-server +ensure_services_started s-object s-proxy set +o xtrace diff --git a/projects/40_glance/upgrade.sh b/projects/40_glance/upgrade.sh index 1b6f6822..7822ebd7 100755 --- a/projects/40_glance/upgrade.sh +++ b/projects/40_glance/upgrade.sh @@ -62,7 +62,7 @@ $GLANCE_BIN_DIR/glance-manage db_sync || die $LINENO "DB sync error" start_glance # Don't succeed unless the services come up -ensure_services_started glance-api +ensure_services_started g-api set +o xtrace echo "*********************************************************************" diff --git a/projects/60_nova/upgrade.sh b/projects/60_nova/upgrade.sh index c1f8b225..fb830d7f 100755 --- a/projects/60_nova/upgrade.sh +++ b/projects/60_nova/upgrade.sh @@ -90,7 +90,7 @@ fi # upgrade check command is run since that validates that we can connect to # the placement endpoint. start_placement -ensure_services_started placement +ensure_services_started placement-api # Run the nova-status upgrade check, which was only available starting in Ocata # so check to make sure it exists before attempting to run it. @@ -122,7 +122,7 @@ start_nova_rest start_nova_compute # Don't succeed unless the services come up -expected_runnning_services="nova-api nova-conductor " +expected_runnning_services="n-api n-cond " # NOTE(vsaienko) Ironic should be upgraded before nova according to requirements # http://docs.openstack.org/developer/ironic/deploy/upgrade-guide.html#general-upgrades-all-versions # using reverse order will lead to nova-compute start failure. @@ -130,7 +130,7 @@ expected_runnning_services="nova-api nova-conductor " # TODO(vsaienko) remove this once grenade allows to setup dependency between grenade plugin and # core services: https://bugs.launchpad.net/grenade/+bug/1660646 if ! is_service_enabled ironic; then - expected_runnning_services+=' nova-compute' + expected_runnning_services+=' n-cpu' fi ensure_services_started $expected_runnning_services diff --git a/projects/70_cinder/upgrade.sh b/projects/70_cinder/upgrade.sh index 132991f9..020c1f6a 100755 --- a/projects/70_cinder/upgrade.sh +++ b/projects/70_cinder/upgrade.sh @@ -62,9 +62,9 @@ $CINDER_BIN_DIR/cinder-manage db sync || die $LINENO "DB migration error" start_cinder # Don't succeed unless the services come up -ensure_services_started cinder-api +ensure_services_started c-api if is_service_enabled c-vol; then - ensure_services_started cinder-volume + ensure_services_started c-vol fi set +o xtrace