@@ -1,5 +1,12 @@

 #!/usr/bin/env bash

+# Use stackrc.example if stackrc is missing

+if [ ! -e ./stackrc ]; then

+    read -n1 -p "No stackrc present.  Copy stackrc.example to stackrc? (y/n) "

+    echo

+    [[ $REPLY = [yY] ]] && cp stackrc.example stackrc|| { echo "Aborting:  Missing stackrc"; exit 1; }

+fi

+

 # Source params

 source ./stackrc

@@ -1,5 +1,12 @@

 #!/bin/bash

+# Use stackrc.example if stackrc is missing

+if [ ! -e ./stackrc ]; then

+    read -n1 -p "No stackrc present.  Copy stackrc.example to stackrc? (y/n) "

+    echo

+    [[ $REPLY = [yY] ]] && cp stackrc.example stackrc|| { echo "Aborting:  Missing stackrc"; exit 1; }

+fi

+

 # Source params

 source ./stackrc

@@ -59,6 +59,13 @@ set -o errexit

 # an error.  It is also useful for following allowing as the install occurs.

 set -o xtrace

+# Use stackrc.example if stackrc is missing

+if [ ! -e ./stackrc ]; then

+    read -n1 -p "No stackrc present.  Copy stackrc.example to stackrc? (y/n) "

+    echo

+    [[ $REPLY = [yY] ]] && cp stackrc.example stackrc|| { echo "Aborting:  Missing stackrc"; exit 1; }

+fi

+

 # Import variables

 source ./stackrc

deleted file mode 100644

@@ -1,36 +0,0 @@

-# compute service

-NOVA_REPO=https://github.com/openstack/nova.git

-NOVA_BRANCH=2011.3

-

-# image catalog service

-GLANCE_REPO=https://github.com/cloudbuilders/glance.git

-GLANCE_BRANCH=diablo

-

-# unified auth system (manages accounts/tokens)

-KEYSTONE_REPO=https://github.com/cloudbuilders/keystone.git

-KEYSTONE_BRANCH=diablo

-

-# a websockets/html5 or flash powered VNC console for vm instances

-NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git

-NOVNC_BRANCH=master

-

-# django powered web control panel for openstack

-DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git

-DASH_BRANCH=master

-

-# add nixon, will use this to show munin graphs in dashboard

-NIXON_REPO=https://github.com/cloudbuilders/nixon.git

-NIXON_BRANCH=diablo

-

-# python client library to nova that dashboard (and others) use

-NOVACLIENT_REPO=https://github.com/cloudbuilders/python-novaclient.git

-NOVACLIENT_BRANCH=master

-

-# openstackx is a collection of extensions to openstack.compute & nova

-# that is *deprecated*.  The code is being moved into python-novaclient & nova.

-OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git

-OPENSTACKX_BRANCH=diablo

-

-# openstack-munin is a collection of munin plugins for monitoring the stack

-MUNIN_REPO=https://github.com/cloudbuilders/openstack-munin.git

-MUNIN_BRANCH=master

new file mode 100644

@@ -0,0 +1,36 @@

+# compute service

+NOVA_REPO=https://github.com/openstack/nova.git

+NOVA_BRANCH=2011.3

+

+# image catalog service

+GLANCE_REPO=https://github.com/cloudbuilders/glance.git

+GLANCE_BRANCH=diablo

+

+# unified auth system (manages accounts/tokens)

+KEYSTONE_REPO=https://github.com/cloudbuilders/keystone.git

+KEYSTONE_BRANCH=diablo

+

+# a websockets/html5 or flash powered VNC console for vm instances

+NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git

+NOVNC_BRANCH=master

+

+# django powered web control panel for openstack

+DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git

+DASH_BRANCH=master

+

+# add nixon, will use this to show munin graphs in dashboard

+NIXON_REPO=https://github.com/cloudbuilders/nixon.git

+NIXON_BRANCH=diablo

+

+# python client library to nova that dashboard (and others) use

+NOVACLIENT_REPO=https://github.com/cloudbuilders/python-novaclient.git

+NOVACLIENT_BRANCH=master

+

+# openstackx is a collection of extensions to openstack.compute & nova

+# that is *deprecated*.  The code is being moved into python-novaclient & nova.

+OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git

+OPENSTACKX_BRANCH=diablo

+

+# openstack-munin is a collection of munin plugins for monitoring the stack

+MUNIN_REPO=https://github.com/cloudbuilders/openstack-munin.git

+MUNIN_BRANCH=master