Merge pull request #181 from jeblair/master
Don't clone or install disabled services.
This commit is contained in:
commit
b7c3a5eefd
2 changed files with 69 additions and 30 deletions
|
@ -1,5 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
source ./stackrc
|
||||||
# Run everything in the exercises/ directory that isn't explicitly disabled
|
# Run everything in the exercises/ directory that isn't explicitly disabled
|
||||||
|
|
||||||
# comma separated list of script basenames to skip
|
# comma separated list of script basenames to skip
|
||||||
|
@ -44,3 +45,7 @@ done
|
||||||
for script in $failures; do
|
for script in $failures; do
|
||||||
echo FAILED $script
|
echo FAILED $script
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [ -n "$failures" ] ; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
38
stack.sh
38
stack.sh
|
@ -407,25 +407,39 @@ function git_clone {
|
||||||
|
|
||||||
# compute service
|
# compute service
|
||||||
git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH
|
git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH
|
||||||
|
# python client library to nova that horizon (and others) use
|
||||||
|
git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
|
||||||
# storage service
|
# storage service
|
||||||
git_clone $SWIFT_REPO $SWIFT_DIR $SWIFT_BRANCH
|
git_clone $SWIFT_REPO $SWIFT_DIR $SWIFT_BRANCH
|
||||||
# swift + keystone middleware
|
# swift + keystone middleware
|
||||||
git_clone $SWIFT_KEYSTONE_REPO $SWIFT_KEYSTONE_DIR $SWIFT_KEYSTONE_BRANCH
|
git_clone $SWIFT_KEYSTONE_REPO $SWIFT_KEYSTONE_DIR $SWIFT_KEYSTONE_BRANCH
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "g-api" ]]; then
|
||||||
# image catalog service
|
# image catalog service
|
||||||
git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
|
git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
|
||||||
# unified auth system (manages accounts/tokens)
|
# unified auth system (manages accounts/tokens)
|
||||||
git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH
|
git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "n-vnc" ]]; then
|
||||||
# a websockets/html5 or flash powered VNC console for vm instances
|
# a websockets/html5 or flash powered VNC console for vm instances
|
||||||
git_clone $NOVNC_REPO $NOVNC_DIR $NOVNC_BRANCH
|
git_clone $NOVNC_REPO $NOVNC_DIR $NOVNC_BRANCH
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
|
||||||
# django powered web control panel for openstack
|
# django powered web control panel for openstack
|
||||||
git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG
|
git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG
|
||||||
# python client library to nova that horizon (and others) use
|
fi
|
||||||
git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH
|
if [[ "$ENABLED_SERVICES" =~ "openstackx" ]]; then
|
||||||
# openstackx is a collection of extensions to openstack.compute & nova
|
# openstackx is a collection of extensions to openstack.compute & nova
|
||||||
# that is *deprecated*. The code is being moved into python-novaclient & nova.
|
# that is *deprecated*. The code is being moved into python-novaclient & nova.
|
||||||
git_clone $OPENSTACKX_REPO $OPENSTACKX_DIR $OPENSTACKX_BRANCH
|
git_clone $OPENSTACKX_REPO $OPENSTACKX_DIR $OPENSTACKX_BRANCH
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then
|
||||||
# quantum
|
# quantum
|
||||||
git_clone $QUANTUM_REPO $QUANTUM_DIR $QUANTUM_BRANCH
|
git_clone $QUANTUM_REPO $QUANTUM_DIR $QUANTUM_BRANCH
|
||||||
|
fi
|
||||||
|
|
||||||
# Initialization
|
# Initialization
|
||||||
# ==============
|
# ==============
|
||||||
|
@ -433,16 +447,28 @@ git_clone $QUANTUM_REPO $QUANTUM_DIR $QUANTUM_BRANCH
|
||||||
|
|
||||||
# setup our checkouts so they are installed into python path
|
# setup our checkouts so they are installed into python path
|
||||||
# allowing ``import nova`` or ``import glance.client``
|
# allowing ``import nova`` or ``import glance.client``
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "key" ]]; then
|
||||||
cd $KEYSTONE_DIR; sudo python setup.py develop
|
cd $KEYSTONE_DIR; sudo python setup.py develop
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
|
||||||
cd $SWIFT_DIR; sudo python setup.py develop
|
cd $SWIFT_DIR; sudo python setup.py develop
|
||||||
cd $SWIFT_KEYSTONE_DIR; sudo python setup.py develop
|
cd $SWIFT_KEYSTONE_DIR; sudo python setup.py develop
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "g-api" ]]; then
|
||||||
cd $GLANCE_DIR; sudo python setup.py develop
|
cd $GLANCE_DIR; sudo python setup.py develop
|
||||||
|
fi
|
||||||
cd $NOVACLIENT_DIR; sudo python setup.py develop
|
cd $NOVACLIENT_DIR; sudo python setup.py develop
|
||||||
cd $NOVA_DIR; sudo python setup.py develop
|
cd $NOVA_DIR; sudo python setup.py develop
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "openstackx" ]]; then
|
||||||
cd $OPENSTACKX_DIR; sudo python setup.py develop
|
cd $OPENSTACKX_DIR; sudo python setup.py develop
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
|
||||||
cd $HORIZON_DIR/django-openstack; sudo python setup.py develop
|
cd $HORIZON_DIR/django-openstack; sudo python setup.py develop
|
||||||
cd $HORIZON_DIR/openstack-dashboard; sudo python setup.py develop
|
cd $HORIZON_DIR/openstack-dashboard; sudo python setup.py develop
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "quantum" ]]; then
|
||||||
cd $QUANTUM_DIR; sudo python setup.py develop
|
cd $QUANTUM_DIR; sudo python setup.py develop
|
||||||
|
fi
|
||||||
|
|
||||||
# Add a useful screenrc. This isn't required to run openstack but is we do
|
# Add a useful screenrc. This isn't required to run openstack but is we do
|
||||||
# it since we are going to run the services in screen for simple
|
# it since we are going to run the services in screen for simple
|
||||||
|
@ -828,9 +854,13 @@ add_nova_flag "--public_interface=$PUBLIC_INTERFACE"
|
||||||
add_nova_flag "--vlan_interface=$VLAN_INTERFACE"
|
add_nova_flag "--vlan_interface=$VLAN_INTERFACE"
|
||||||
add_nova_flag "--sql_connection=$BASE_SQL_CONN/nova"
|
add_nova_flag "--sql_connection=$BASE_SQL_CONN/nova"
|
||||||
add_nova_flag "--libvirt_type=$LIBVIRT_TYPE"
|
add_nova_flag "--libvirt_type=$LIBVIRT_TYPE"
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "openstackx" ]]; then
|
||||||
add_nova_flag "--osapi_extensions_path=$OPENSTACKX_DIR/extensions"
|
add_nova_flag "--osapi_extensions_path=$OPENSTACKX_DIR/extensions"
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "n-vnc" ]]; then
|
||||||
add_nova_flag "--vncproxy_url=http://$HOST_IP:6080"
|
add_nova_flag "--vncproxy_url=http://$HOST_IP:6080"
|
||||||
add_nova_flag "--vncproxy_wwwroot=$NOVNC_DIR/"
|
add_nova_flag "--vncproxy_wwwroot=$NOVNC_DIR/"
|
||||||
|
fi
|
||||||
add_nova_flag "--api_paste_config=$NOVA_DIR/bin/nova-api-paste.ini"
|
add_nova_flag "--api_paste_config=$NOVA_DIR/bin/nova-api-paste.ini"
|
||||||
add_nova_flag "--image_service=nova.image.glance.GlanceImageService"
|
add_nova_flag "--image_service=nova.image.glance.GlanceImageService"
|
||||||
add_nova_flag "--ec2_dmz_host=$EC2_DMZ_HOST"
|
add_nova_flag "--ec2_dmz_host=$EC2_DMZ_HOST"
|
||||||
|
@ -1028,8 +1058,12 @@ screen_it n-cpu "cd $NOVA_DIR && sg libvirtd $NOVA_DIR/bin/nova-compute"
|
||||||
screen_it n-vol "cd $NOVA_DIR && $NOVA_DIR/bin/nova-volume"
|
screen_it n-vol "cd $NOVA_DIR && $NOVA_DIR/bin/nova-volume"
|
||||||
screen_it n-net "cd $NOVA_DIR && $NOVA_DIR/bin/nova-network"
|
screen_it n-net "cd $NOVA_DIR && $NOVA_DIR/bin/nova-network"
|
||||||
screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler"
|
screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler"
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "n-vnc" ]]; then
|
||||||
screen_it n-vnc "cd $NOVNC_DIR && ./utils/nova-wsproxy.py --flagfile $NOVA_DIR/bin/nova.conf --web . 6080"
|
screen_it n-vnc "cd $NOVNC_DIR && ./utils/nova-wsproxy.py --flagfile $NOVA_DIR/bin/nova.conf --web . 6080"
|
||||||
|
fi
|
||||||
|
if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
|
||||||
screen_it horizon "cd $HORIZON_DIR && sudo tail -f /var/log/apache2/error.log"
|
screen_it horizon "cd $HORIZON_DIR && sudo tail -f /var/log/apache2/error.log"
|
||||||
|
fi
|
||||||
|
|
||||||
# Install Images
|
# Install Images
|
||||||
# ==============
|
# ==============
|
||||||
|
|
Loading…
Reference in a new issue