latest keystone configuration for python-novaclient and dash
diff --git a/build_lxc.sh b/build_lxc.sh
index 6caffb6..a13ca35 100755
--- a/build_lxc.sh
+++ b/build_lxc.sh
@@ -1,12 +1,5 @@
#!/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
diff --git a/build_nfs.sh b/build_nfs.sh
index c0fa733..fa3e3ef 100755
--- a/build_nfs.sh
+++ b/build_nfs.sh
@@ -1,12 +1,5 @@
#!/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
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index c5dd09b..1635b9d 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -22,7 +22,7 @@
# Services
$BIN_DIR/keystone-manage $* service add nova_compat nova_compat nova_compat
-$BIN_DIR/keystone-manage $* service add nova nova nova
+$BIN_DIR/keystone-manage $* service add compute compute compute
$BIN_DIR/keystone-manage $* service add glance glance glance
$BIN_DIR/keystone-manage $* service add identity identity identity
diff --git a/stack.sh b/stack.sh
index ba32424..7ecbc83 100755
--- a/stack.sh
+++ b/stack.sh
@@ -59,13 +59,6 @@
# 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
diff --git a/stackrc.example b/stackrc
similarity index 94%
rename from stackrc.example
rename to stackrc
index 2d265d3..19fed17 100644
--- a/stackrc.example
+++ b/stackrc
@@ -16,7 +16,7 @@
# django powered web control panel for openstack
DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git
-DASH_BRANCH=master
+DASH_BRANCH=service_catalog_compute
# add nixon, will use this to show munin graphs in dashboard
NIXON_REPO=https://github.com/cloudbuilders/nixon.git
@@ -24,7 +24,7 @@
# python client library to nova that dashboard (and others) use
NOVACLIENT_REPO=https://github.com/cloudbuilders/python-novaclient.git
-NOVACLIENT_BRANCH=master
+NOVACLIENT_BRANCH=rackspace_master
# openstackx is a collection of extensions to openstack.compute & nova
# that is *deprecated*. The code is being moved into python-novaclient & nova.