latest keystone configuration for python-novaclient and dash

This commit is contained in:
Anthony Young 2011-09-27 00:12:52 -07:00
parent 124b0c253d
commit 34acee3699
5 changed files with 3 additions and 24 deletions

View File

@ -1,12 +1,5 @@
#!/usr/bin/env bash #!/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 params
source ./stackrc source ./stackrc

View File

@ -1,12 +1,5 @@
#!/bin/bash #!/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 params
source ./stackrc source ./stackrc

View File

@ -22,7 +22,7 @@ $BIN_DIR/keystone-manage $* role grant KeystoneServiceAdmin admin
# Services # Services
$BIN_DIR/keystone-manage $* service add nova_compat nova_compat nova_compat $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 glance glance glance
$BIN_DIR/keystone-manage $* service add identity identity identity $BIN_DIR/keystone-manage $* service add identity identity identity

View File

@ -59,13 +59,6 @@ set -o errexit
# an error. It is also useful for following allowing as the install occurs. # an error. It is also useful for following allowing as the install occurs.
set -o xtrace 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 # Import variables
source ./stackrc source ./stackrc

View File

@ -16,7 +16,7 @@ NOVNC_BRANCH=master
# django powered web control panel for openstack # django powered web control panel for openstack
DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git 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 # add nixon, will use this to show munin graphs in dashboard
NIXON_REPO=https://github.com/cloudbuilders/nixon.git NIXON_REPO=https://github.com/cloudbuilders/nixon.git
@ -24,7 +24,7 @@ NIXON_BRANCH=diablo
# python client library to nova that dashboard (and others) use # python client library to nova that dashboard (and others) use
NOVACLIENT_REPO=https://github.com/cloudbuilders/python-novaclient.git 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 # openstackx is a collection of extensions to openstack.compute & nova
# that is *deprecated*. The code is being moved into python-novaclient & nova. # that is *deprecated*. The code is being moved into python-novaclient & nova.