Comment 2 for bug 1448189

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to trove-integration (master)

Reviewed: https://review.openstack.org/177324
Committed: https://git.openstack.org/cgit/openstack/trove-integration/commit/?id=0a518f5079c49e63e8855fd41547de8d0cd5a8c6
Submitter: Jenkins
Branch: master

commit 0a518f5079c49e63e8855fd41547de8d0cd5a8c6
Author: Peter Stachowski <email address hidden>
Date: Fri Apr 24 15:48:34 2015 +0000

    Fix redstack issues (stop/start,plugin use,conf)

    Due to having multiple patchsets in flight at the same time
    (https://review.openstack.org/#/c/158540/
    https://review.openstack.org/#/c/167047/
    https://review.openstack.org/#/c/155913/ and possibly others),
    a number of things stopped working (mostly due to auto-merge issues).

    1. 'start' and 'stop' still relied on having the Trove setup support in
    devstack (the lib/trove file).
    2. Two instances of the Trove services are started as devstack doesn't
    check if a plugin is enabled when starting the same services.
    3. The trove.conf.rc file in local.conf.d stopped being added to
    local.conf, as the variable name 'TROVE_CONF' now conflicts with the
    actual Trove service configuration file.
    4. The localrc that was sourced previously is no longer available. The
    generated file '.localrc.auto' needs to be sourced instead.

    These issues were fixed as noted:

    1. 'stop' and 'start' now depend on a variable to find the commands
    file. This variable is set to $PATH_DEVSTACK_SRC/lib/trove if it
    exists, otherwise it's set to $DEST/devstack/plugin.sh If neither
    exists, redstack stops with an error.
    2. If $PATH_DEVSTACK_SRC/lib/trove exists, redstack disables the
    devstack Trove plugin under the assumption that devstack will set up
    Trove based on its files.
    3. The trove.conf.rc file was renamed to trove_services.conf.rc
    4. '.localrc.auto' is sourced if it exists

    Change-Id: Ic1e5a809a47b3f00d5eaec30237e37b73c676aad
    Closes-Bug: #1448189