From f6fd4dcf2e9c29f3ed4b911abc16bbb4b8af4b70 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Tue, 11 Oct 2011 20:03:05 -0500 Subject: [PATCH 1/3] Check out devstack by default --- stackrc | 4 ++++ tools/build_ramdisk.sh | 2 ++ 2 files changed, 6 insertions(+) diff --git a/stackrc b/stackrc index 15d73ce7c6..871db69767 100644 --- a/stackrc +++ b/stackrc @@ -27,6 +27,10 @@ NOVACLIENT_BRANCH=master OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git OPENSTACKX_BRANCH=diablo +# devstack is this collection of scripts +DEVSTACK_REPO=https://github.com/cloudbuilders/devstack.git +DEVSTACK_BRANCH=master + # allow local overrides of env variables if [ -f ./localrc ]; then source ./localrc diff --git a/tools/build_ramdisk.sh b/tools/build_ramdisk.sh index 63d37a9d9b..85d3743e6f 100755 --- a/tools/build_ramdisk.sh +++ b/tools/build_ramdisk.sh @@ -100,6 +100,8 @@ git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack +else + git_clone $DEVSTACK_REPO $DEST/devstack $DEVSTACK_BRANCH fi # Configure host network for DHCP From b5da51972cf8d6e7919d87dfe0767bffdb16a441 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Mon, 17 Oct 2011 13:32:06 -0500 Subject: [PATCH 2/3] Always use current devstack in ramdisk --- stackrc | 4 ---- tools/build_ramdisk.sh | 11 ++++------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/stackrc b/stackrc index 871db69767..15d73ce7c6 100644 --- a/stackrc +++ b/stackrc @@ -27,10 +27,6 @@ NOVACLIENT_BRANCH=master OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git OPENSTACKX_BRANCH=diablo -# devstack is this collection of scripts -DEVSTACK_REPO=https://github.com/cloudbuilders/devstack.git -DEVSTACK_BRANCH=master - # allow local overrides of env variables if [ -f ./localrc ]; then source ./localrc diff --git a/tools/build_ramdisk.sh b/tools/build_ramdisk.sh index 85d3743e6f..437b103b2f 100755 --- a/tools/build_ramdisk.sh +++ b/tools/build_ramdisk.sh @@ -96,13 +96,10 @@ git_clone $DASH_REPO $DEST/dash $DASH_BRANCH git_clone $NOVACLIENT_REPO $DEST/python-novaclient $NOVACLIENT_BRANCH git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH -# Use this version of devstack? -if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then - rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack - cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack -else - git_clone $DEVSTACK_REPO $DEST/devstack $DEVSTACK_BRANCH -fi +# Use this version of devstack +rm -rf $CHROOTCACHE/natty-stack/$DEST/devstack +cp -pr $CWD $CHROOTCACHE/natty-stack/$DEST/devstack +chroot $CHROOTCACHE/natty-stack chown -R stack $DEST/devstack # Configure host network for DHCP mkdir -p $CHROOTCACHE/natty-stack/etc/network From 314bc2247d2e2312ab0bb41aa7aba85afd96ad12 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Tue, 18 Oct 2011 16:32:13 -0500 Subject: [PATCH 3/3] Fix another chroot/chown combo --- tools/build_ramdisk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build_ramdisk.sh b/tools/build_ramdisk.sh index 437b103b2f..0f93735769 100755 --- a/tools/build_ramdisk.sh +++ b/tools/build_ramdisk.sh @@ -42,7 +42,7 @@ if [ ! -d $CHROOTCACHE/natty-dev ]; then chroot $CHROOTCACHE/natty-dev groupadd libvirtd chroot $CHROOTCACHE/natty-dev useradd stack -s /bin/bash -d $DEST -G libvirtd mkdir -p $CHROOTCACHE/natty-dev/$DEST - chown stack $CHROOTCACHE/natty-dev/$DEST + chroot $CHROOTCACHE/natty-dev chown stack $DEST # a simple password - pass echo stack:pass | chroot $CHROOTCACHE/natty-dev chpasswd