diff --git a/stack.sh b/stack.sh index 444f543..5deafe8 100755 --- a/stack.sh +++ b/stack.sh @@ -43,10 +43,12 @@ fi # as root, since apache refused to startup serve content from root user). If # stack.sh is run as root, it automatically creates a stack user with # sudo privileges and runs as that user. + if [[ $EUID -eq 0 ]]; then echo "You are running this script as root." - # ensure sudo + # since this script runs as a normal user, we need to give that user + # ability to run sudo apt-get update apt-get install -y sudo @@ -122,6 +124,8 @@ ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-v # an **LXC** based system. LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm} +# nova supports pluggable schedulers. ``SimpleScheduler`` should work in most +# cases unless you are working on multi-zone mode. SCHEDULER=${SCHEDULER:-nova.scheduler.simple.SimpleScheduler} # Use the first IP unless an explicit is set by ``HOST_IP`` environment variable @@ -133,19 +137,26 @@ fi # -------------------------- PUBLIC_INTERFACE=${PUBLIC_INTERFACE:-eth0} -VLAN_INTERFACE=${VLAN_INTERFACE:-$PUBLIC_INTERFACE} -FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.1/28} FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24} FIXED_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256} +FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.1/28} NET_MAN=${NET_MAN:-FlatDHCPManager} EC2_DMZ_HOST=${EC2_DMZ_HOST:-$HOST_IP} FLAT_NETWORK_BRIDGE=${FLAT_NETWORK_BRIDGE:-br100} +VLAN_INTERFACE=${VLAN_INTERFACE:-$PUBLIC_INTERFACE} + +# Multi-host is a mode where each compute node runs its own network node. This +# allows network operations and routing for a VM to occur on the server that is +# running the VM - removing a SPOF and bandwidth bottleneck. +MULTI_HOST=${MULTI_HOST:-0} # If you are using FlatDHCP on multiple hosts, set the ``FLAT_INTERFACE`` # variable but make sure that the interface doesn't already have an # ip or you risk breaking things. FLAT_INTERFACE=${FLAT_INTERFACE:-eth0} +## FIXME(ja): should/can we check that FLAT_INTERFACE is sane? + # MySQL & RabbitMQ # ---------------- @@ -186,13 +197,6 @@ ADMIN_PASSWORD=${ADMIN_PASSWORD:-`openssl rand -hex 12`} # # Openstack uses a fair number of other projects. -# Seed configuration with mysql password so that apt-get install doesn't -# prompt us for a password upon install. -cat <