openstack
/
devstack-gate
Code Issues Proposed changes

Merge "DEVSTACK_GATE_HEAT conditional for enabling heat"

This commit is contained in:
Jenkins 2013-05-20 18:10:29 +00:00 committed by Gerrit Code Review
parent 686ab7d2da 5cbb0b4343
commit e2d4168bfd
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack-vm-gate-dev.sh
View File

@ -19,6 +19,7 @@ export GERRIT_PATCHSET_NUMBER=1
export DEVSTACK_GATE_TEMPEST=${DEVSTACK_GATE_TEMPEST:-0}
export DEVSTACK_GATE_CINDER=${DEVSTACK_GATE_CINDER:-0}
export DEVSTACK_GATE_QUANTUM=${DEVSTACK_GATE_QUANTUM:-0}
export DEVSTACK_GATE_HEAT=${DEVSTACK_GATE_HEAT:-0}
export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-""}
EOF

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

@ -43,6 +43,10 @@ export DEVSTACK_CINDER_SECURE_DELETE=${DEVSTACK_CINDER_SECURE_DELETE:-0}
# Only applicable to master branch
export DEVSTACK_GATE_QUANTUM=${DEVSTACK_GATE_QUANTUM:-0}
# Set to 1 to run heat
# Only applicable to master branch
export DEVSTACK_GATE_HEAT=${DEVSTACK_GATE_HEAT:-0}
# Set to 1 to run grenade.
export DEVSTACK_GATE_GRENADE=${DEVSTACK_GATE_GRENADE:-0}

6
devstack-vm-gate.sh
View File

@ -62,6 +62,12 @@ function setup_localrc() {
else
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net
fi
if [ "$DEVSTACK_GATE_HEAT" -eq "1" ]; then
MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,heat,h-api,h-api-cfn,h-api-cw,h-eng
# When uncommented this will download and register the most recent successfully built
# ubuntu-vm-heat-cfntools image from jenkins.tripleo.org
# echo "IMAGE_URLS+=,\"http://jenkins.tripleo.org:8080/job/autobuilt-images/elements=ubuntu%20vm%20heat-cfntools/lastSuccessfulBuild/artifact/ubuntu-vm-heat-cfntools.qcow2\"" >>localrc
fi
fi
cat <<EOF >>localrc