From 73c0913bbb3a3b93a06a590876ceaebf4ca8ecc6 Mon Sep 17 00:00:00 2001 From: eperdomo Date: Tue, 3 Apr 2012 01:59:34 -0700 Subject: [PATCH 1/2] First Customer Release --- stack.sh | 18 ++++++++++++++++++ stackrc | 36 +++++++++++++++++------------------- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/stack.sh b/stack.sh index ae4ee87d9a..e206a0b149 100755 --- a/stack.sh +++ b/stack.sh @@ -1646,6 +1646,24 @@ if is_service_enabled g-reg; then IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}http://images.ansolabs.com/tty.tgz" fi + # Option to upload quantum images, which provide multi-interface support. + if [ $UPLOAD_QUANTUM_TTY ]; then + if [ ! -f $FILES/tty-quantum.tgz ]; then + wget -c http://www.openvswitch.org/tty-quantum.tgz \ + -O $FILES/tty-quantum.tgz + fi + + if [ ! -d ${FILES}/images-quantum ]; then + mkdir -p ${FILES}/images-quantum + fi + tar -zxf $FILES/tty-quantum.tgz -C $FILES/images-quantum + RVAL=`glance add --silent-upload -A $TOKEN name="tty-quantum-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images-quantum/aki-tty/image` + KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "` + RVAL=`glance add --silent-upload -A $TOKEN name="tty-quantum-ramdisk" is_public=true container_format=ari disk_format=ari < $FILES/images-quantum/ari-tty/image` + RAMDISK_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "` + glance add -A $TOKEN name="tty-quantum" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID ramdisk_id=$RAMDISK_ID < $FILES/images-quantum/ami-tty/image + fi + for image_url in ${IMAGE_URLS//,/ }; do # Downloads the image (uec ami+aki style), then extracts it. IMAGE_FNAME=`basename "$image_url"` diff --git a/stackrc b/stackrc index d0fa1c25a0..f5cb2a43c2 100644 --- a/stackrc +++ b/stackrc @@ -8,61 +8,59 @@ RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd) # localrc to add it with the other services: # ENABLED_SERVICES="$ENABLED_SERVICES,swift" ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit +#Q_PLUGIN=openvswitch + # compute service -NOVA_REPO=https://github.com/openstack/nova.git +NOVA_REPO=https://github.com/Cygnet/nova.git NOVA_BRANCH=master # storage service -SWIFT_REPO=https://github.com/openstack/swift.git +SWIFT_REPO=https://github.com/Cygnet/swift.git SWIFT_BRANCH=master -# swift and keystone integration -SWIFT_KEYSTONE_REPO=https://github.com/cloudbuilders/swift-keystone2.git -SWIFT_KEYSTONE_BRANCH=master - # image catalog service -GLANCE_REPO=https://github.com/openstack/glance.git +GLANCE_REPO=https://github.com/Cygnet/glance.git GLANCE_BRANCH=master # unified auth system (manages accounts/tokens) -KEYSTONE_REPO=https://github.com/openstack/keystone.git +KEYSTONE_REPO=https://github.com/Cygnet/keystone.git KEYSTONE_BRANCH=master # a websockets/html5 or flash powered VNC console for vm instances -NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git +NOVNC_REPO=https://github.com/Cygnet/noVNC.git NOVNC_BRANCH=master # django powered web control panel for openstack -HORIZON_REPO=https://github.com/openstack/horizon.git +HORIZON_REPO=https://github.com/Cygnet/horizon.git HORIZON_BRANCH=master # python client library to nova that horizon (and others) use -NOVACLIENT_REPO=https://github.com/openstack/python-novaclient.git +NOVACLIENT_REPO=https://github.com/Cygnet/python-novaclient.git NOVACLIENT_BRANCH=master # python keystone client library to nova that horizon uses -KEYSTONECLIENT_REPO=https://github.com/openstack/python-keystoneclient +KEYSTONECLIENT_REPO=https://github.com/Cygnet/python-keystoneclient KEYSTONECLIENT_BRANCH=master # quantum service -QUANTUM_REPO=https://github.com/openstack/quantum +QUANTUM_REPO=https://github.com/Cygnet/quantum QUANTUM_BRANCH=master # quantum client -QUANTUM_CLIENT_REPO=https://github.com/openstack/python-quantumclient +QUANTUM_CLIENT_REPO=https://github.com/Cygnet/python-quantumclient QUANTUM_CLIENT_BRANCH=master # Tempest test suite -TEMPEST_REPO=https://github.com/openstack/tempest.git +TEMPEST_REPO=https://github.com/Cygnet/tempest.git TEMPEST_BRANCH=master # melange service -MELANGE_REPO=https://github.com/openstack/melange.git +MELANGE_REPO=https://github.com/Cygnet/melange.git MELANGE_BRANCH=master # python melange client library -MELANGECLIENT_REPO=https://github.com/openstack/python-melangeclient.git +MELANGECLIENT_REPO=https://github.com/Cygnet/python-melangeclient.git MELANGECLIENT_BRANCH=master # Specify a comma-separated list of uec images to download and install into glance. @@ -82,9 +80,9 @@ MELANGECLIENT_BRANCH=master #IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" # cirros full disk image case "$LIBVIRT_TYPE" in lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc - IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz";; + IMAGE_URLS="";; #"http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz";; *) # otherwise, use the uec style image (with kernel, ramdisk, disk) - IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz";; + IMAGE_URLS="";; #"http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz";; esac # allow local overrides of env variables From 10a9b0cc0343fadc7918484897126efb3693fdc1 Mon Sep 17 00:00:00 2001 From: eperdomo Date: Wed, 4 Apr 2012 13:52:21 -0700 Subject: [PATCH 2/2] Fixing stackrc --- stack.sh | 18 ------------------ stackrc | 36 +++++++++++++++++++----------------- 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/stack.sh b/stack.sh index 2e2e2008d9..444a738154 100755 --- a/stack.sh +++ b/stack.sh @@ -1655,24 +1655,6 @@ if is_service_enabled g-reg; then IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}http://images.ansolabs.com/tty.tgz" fi - # Option to upload quantum images, which provide multi-interface support. - if [ $UPLOAD_QUANTUM_TTY ]; then - if [ ! -f $FILES/tty-quantum.tgz ]; then - wget -c http://www.openvswitch.org/tty-quantum.tgz \ - -O $FILES/tty-quantum.tgz - fi - - if [ ! -d ${FILES}/images-quantum ]; then - mkdir -p ${FILES}/images-quantum - fi - tar -zxf $FILES/tty-quantum.tgz -C $FILES/images-quantum - RVAL=`glance add --silent-upload -A $TOKEN name="tty-quantum-kernel" is_public=true container_format=aki disk_format=aki < $FILES/images-quantum/aki-tty/image` - KERNEL_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "` - RVAL=`glance add --silent-upload -A $TOKEN name="tty-quantum-ramdisk" is_public=true container_format=ari disk_format=ari < $FILES/images-quantum/ari-tty/image` - RAMDISK_ID=`echo $RVAL | cut -d":" -f2 | tr -d " "` - glance add -A $TOKEN name="tty-quantum" is_public=true container_format=ami disk_format=ami kernel_id=$KERNEL_ID ramdisk_id=$RAMDISK_ID < $FILES/images-quantum/ami-tty/image - fi - for image_url in ${IMAGE_URLS//,/ }; do # Downloads the image (uec ami+aki style), then extracts it. IMAGE_FNAME=`basename "$image_url"` diff --git a/stackrc b/stackrc index f5cb2a43c2..d0fa1c25a0 100644 --- a/stackrc +++ b/stackrc @@ -8,59 +8,61 @@ RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd) # localrc to add it with the other services: # ENABLED_SERVICES="$ENABLED_SERVICES,swift" ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit -#Q_PLUGIN=openvswitch - # compute service -NOVA_REPO=https://github.com/Cygnet/nova.git +NOVA_REPO=https://github.com/openstack/nova.git NOVA_BRANCH=master # storage service -SWIFT_REPO=https://github.com/Cygnet/swift.git +SWIFT_REPO=https://github.com/openstack/swift.git SWIFT_BRANCH=master +# swift and keystone integration +SWIFT_KEYSTONE_REPO=https://github.com/cloudbuilders/swift-keystone2.git +SWIFT_KEYSTONE_BRANCH=master + # image catalog service -GLANCE_REPO=https://github.com/Cygnet/glance.git +GLANCE_REPO=https://github.com/openstack/glance.git GLANCE_BRANCH=master # unified auth system (manages accounts/tokens) -KEYSTONE_REPO=https://github.com/Cygnet/keystone.git +KEYSTONE_REPO=https://github.com/openstack/keystone.git KEYSTONE_BRANCH=master # a websockets/html5 or flash powered VNC console for vm instances -NOVNC_REPO=https://github.com/Cygnet/noVNC.git +NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git NOVNC_BRANCH=master # django powered web control panel for openstack -HORIZON_REPO=https://github.com/Cygnet/horizon.git +HORIZON_REPO=https://github.com/openstack/horizon.git HORIZON_BRANCH=master # python client library to nova that horizon (and others) use -NOVACLIENT_REPO=https://github.com/Cygnet/python-novaclient.git +NOVACLIENT_REPO=https://github.com/openstack/python-novaclient.git NOVACLIENT_BRANCH=master # python keystone client library to nova that horizon uses -KEYSTONECLIENT_REPO=https://github.com/Cygnet/python-keystoneclient +KEYSTONECLIENT_REPO=https://github.com/openstack/python-keystoneclient KEYSTONECLIENT_BRANCH=master # quantum service -QUANTUM_REPO=https://github.com/Cygnet/quantum +QUANTUM_REPO=https://github.com/openstack/quantum QUANTUM_BRANCH=master # quantum client -QUANTUM_CLIENT_REPO=https://github.com/Cygnet/python-quantumclient +QUANTUM_CLIENT_REPO=https://github.com/openstack/python-quantumclient QUANTUM_CLIENT_BRANCH=master # Tempest test suite -TEMPEST_REPO=https://github.com/Cygnet/tempest.git +TEMPEST_REPO=https://github.com/openstack/tempest.git TEMPEST_BRANCH=master # melange service -MELANGE_REPO=https://github.com/Cygnet/melange.git +MELANGE_REPO=https://github.com/openstack/melange.git MELANGE_BRANCH=master # python melange client library -MELANGECLIENT_REPO=https://github.com/Cygnet/python-melangeclient.git +MELANGECLIENT_REPO=https://github.com/openstack/python-melangeclient.git MELANGECLIENT_BRANCH=master # Specify a comma-separated list of uec images to download and install into glance. @@ -80,9 +82,9 @@ MELANGECLIENT_BRANCH=master #IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" # cirros full disk image case "$LIBVIRT_TYPE" in lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc - IMAGE_URLS="";; #"http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz";; + IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-rootfs.img.gz";; *) # otherwise, use the uec style image (with kernel, ramdisk, disk) - IMAGE_URLS="";; #"http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz";; + IMAGE_URLS="http://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-uec.tar.gz";; esac # allow local overrides of env variables