diff options
| author | rabi <ramishra@redhat.com> | 2016-08-27 08:30:32 +0530 |
|---|---|---|
| committer | rabi <ramishra@redhat.com> | 2016-12-06 18:17:54 +0530 |
| commit | bebe21ae1369e42bf3d4664facaaeac4a5b16ab6 (patch) | |
| tree | 643ad7afade6cb323b88b5538bab72c456faa2eb /devstack/upgrade | |
| parent | 4078e228dd713e3b97b17b5c625bc2a710dd2eb0 (diff) | |
| download | heat-bebe21ae1369e42bf3d4664facaaeac4a5b16ab6.tar.gz | |
Revert "Fix devstack plugin" workaround
This reverts the workaround for the devstack plugin,
as now the gate jobs pass(with the plugin and no devstack
tree heat code) and make it only a devstack plugin.
Change-Id: Ia8d88eca2dec301b692bbef3e1d8988f00e1936a
Depends-On: I5b60422bf1f5fa78aa8f3383f7a222e0356d9e42
Diffstat (limited to 'devstack/upgrade')
| -rwxr-xr-x | devstack/upgrade/upgrade.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index 5dc7362be..594f95f81 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -82,7 +82,7 @@ HEAT_BIN_DIR=$(dirname $(which heat-manage)) $HEAT_BIN_DIR/heat-manage --config-file $HEAT_CONF db_sync || die $LINENO "DB sync error" # Start Heat -start_heat_with_plugin +start_heat # Don't succeed unless the services come up ensure_services_started heat-api heat-engine heat-api-cloudwatch heat-api-cfn |