From 9371411ddb23c9bf0f592d6b068249a44bdfd783 Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Thu, 13 Dec 2012 02:31:26 -0800 Subject: [PATCH] updating devstack element to reference incubator devstack element points to github:tripleo/incubator, instead of demo. Also, the element now pulls devstack into the image, rather than relying on incubator/scripts/demo to pull it down after the image starts. Change-Id: I878edcc8f5b1a509b14cadfb5fb4c33571a7f312 --- elements/devstack/README.md | 2 +- elements/devstack/install.d/52-image-toolchain | 2 +- elements/devstack/install.d/53-devstack | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100755 elements/devstack/install.d/53-devstack diff --git a/elements/devstack/README.md b/elements/devstack/README.md index b4a790f5..8249e703 100644 --- a/elements/devstack/README.md +++ b/elements/devstack/README.md @@ -1,5 +1,5 @@ Creates an image prepped to make a devstack baremetal cloud. See -demo/scripts/demo within the built image. +incubator/scripts/demo within the built image. Forces a 16GB image to allow room for Swift, Cinder and instance disk images. diff --git a/elements/devstack/install.d/52-image-toolchain b/elements/devstack/install.d/52-image-toolchain index 6adc6884..058a2dfe 100755 --- a/elements/devstack/install.d/52-image-toolchain +++ b/elements/devstack/install.d/52-image-toolchain @@ -10,4 +10,4 @@ apt-get -y install git if [ -n "$http_proxy" ]; then sudo -Hiu stack git config --global http.proxy $http_proxy fi -sudo -Hiu stack git clone https://github.com/tripleo/demo.git +sudo -Hiu stack git clone https://github.com/tripleo/incubator.git diff --git a/elements/devstack/install.d/53-devstack b/elements/devstack/install.d/53-devstack new file mode 100755 index 00000000..0829e4a1 --- /dev/null +++ b/elements/devstack/install.d/53-devstack @@ -0,0 +1,11 @@ +#!/bin/bash +# Initialize devstack in the bootstrap image + +set -e +set -o xtrace + +apt-get -y install git +if [ -n "$http_proxy" ]; then + sudo -Hiu stack git config --global http.proxy $http_proxy +fi +sudo -Hiu stack git clone -b baremetal-dev https://github.com/tripleo/devstack.git