openstack/devstack-gate
Code Issues Proposed changes

Merge "Allow external calling context to inject values."

Browse Source
This commit is contained in:
Jenkins
2013-02-25 23:37:04 +00:00
committed by Gerrit Code Review
parent 63ee40cf3f ca3e27d946
commit 6ab681c9cd
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devstack-vm-gate-wrap.sh
View File

@@ -19,7 +19,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keystone openstack/python-novaclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/quantum openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient"
PROJECTS="openstack-dev/devstack openstack/nova openstack/glance openstack/keystone openstack/python-novaclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/quantum openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient ${PROJECTS}"
# Set to 1 to run the Tempest test suite
export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}

15
devstack-vm-gate.sh
View File

@@ -23,9 +23,20 @@ set -o errexit
cd $BASE/new/devstack
rm -f localrc
# Allow calling context to pre-populate the localrc file with additional values
if [ -z $KEEP_LOCALRC ] ; then
rm -f localrc
fi
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-sch,horizon,mysql,rabbit,sysstat
DEFAULT_ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-sch,horizon,mysql,rabbit,sysstat
# Allow optional injection of ENABLED_SERVICES from the calling context
if [ -z $ENABLED_SERVICES ] ; then
ENABLED_SERVICES=$DEFAULT_ENABLED_SERVICES
else
ENABLED_SERVICES=$DEFAULT_ENABLED_SERVICES,$ENABLED_SERVICES
fi
if [ "$DEVSTACK_GATE_TEMPEST" -eq "1" ]; then
ENABLED_SERVICES=$ENABLED_SERVICES,tempest