Browse code
latest keystone configuration for python-novaclient and dash
Anthony Young authored on 2011/09/27 16:12:52Showing 6 changed files
| ... | ... |
@@ -1,12 +1,5 @@ |
| 1 | 1 |
#!/usr/bin/env bash |
| 2 | 2 |
|
| 3 |
-# Use stackrc.example if stackrc is missing |
|
| 4 |
-if [ ! -e ./stackrc ]; then |
|
| 5 |
- read -n1 -p "No stackrc present. Copy stackrc.example to stackrc? (y/n) " |
|
| 6 |
- echo |
|
| 7 |
- [[ $REPLY = [yY] ]] && cp stackrc.example stackrc|| { echo "Aborting: Missing stackrc"; exit 1; }
|
|
| 8 |
-fi |
|
| 9 |
- |
|
| 10 | 3 |
# Source params |
| 11 | 4 |
source ./stackrc |
| 12 | 5 |
|
| ... | ... |
@@ -1,12 +1,5 @@ |
| 1 | 1 |
#!/bin/bash |
| 2 | 2 |
|
| 3 |
-# Use stackrc.example if stackrc is missing |
|
| 4 |
-if [ ! -e ./stackrc ]; then |
|
| 5 |
- read -n1 -p "No stackrc present. Copy stackrc.example to stackrc? (y/n) " |
|
| 6 |
- echo |
|
| 7 |
- [[ $REPLY = [yY] ]] && cp stackrc.example stackrc|| { echo "Aborting: Missing stackrc"; exit 1; }
|
|
| 8 |
-fi |
|
| 9 |
- |
|
| 10 | 3 |
# Source params |
| 11 | 4 |
source ./stackrc |
| 12 | 5 |
|
| ... | ... |
@@ -22,7 +22,7 @@ $BIN_DIR/keystone-manage $* role grant KeystoneServiceAdmin admin |
| 22 | 22 |
|
| 23 | 23 |
# Services |
| 24 | 24 |
$BIN_DIR/keystone-manage $* service add nova_compat nova_compat nova_compat |
| 25 |
-$BIN_DIR/keystone-manage $* service add nova nova nova |
|
| 25 |
+$BIN_DIR/keystone-manage $* service add compute compute compute |
|
| 26 | 26 |
$BIN_DIR/keystone-manage $* service add glance glance glance |
| 27 | 27 |
$BIN_DIR/keystone-manage $* service add identity identity identity |
| 28 | 28 |
|
| ... | ... |
@@ -59,13 +59,6 @@ set -o errexit |
| 59 | 59 |
# an error. It is also useful for following allowing as the install occurs. |
| 60 | 60 |
set -o xtrace |
| 61 | 61 |
|
| 62 |
-# Use stackrc.example if stackrc is missing |
|
| 63 |
-if [ ! -e ./stackrc ]; then |
|
| 64 |
- read -n1 -p "No stackrc present. Copy stackrc.example to stackrc? (y/n) " |
|
| 65 |
- echo |
|
| 66 |
- [[ $REPLY = [yY] ]] && cp stackrc.example stackrc|| { echo "Aborting: Missing stackrc"; exit 1; }
|
|
| 67 |
-fi |
|
| 68 |
- |
|
| 69 | 62 |
# Import variables |
| 70 | 63 |
source ./stackrc |
| 71 | 64 |
|
| 72 | 65 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,36 @@ |
| 0 |
+# compute service |
|
| 1 |
+NOVA_REPO=https://github.com/openstack/nova.git |
|
| 2 |
+NOVA_BRANCH=2011.3 |
|
| 3 |
+ |
|
| 4 |
+# image catalog service |
|
| 5 |
+GLANCE_REPO=https://github.com/cloudbuilders/glance.git |
|
| 6 |
+GLANCE_BRANCH=diablo |
|
| 7 |
+ |
|
| 8 |
+# unified auth system (manages accounts/tokens) |
|
| 9 |
+KEYSTONE_REPO=https://github.com/cloudbuilders/keystone.git |
|
| 10 |
+KEYSTONE_BRANCH=diablo |
|
| 11 |
+ |
|
| 12 |
+# a websockets/html5 or flash powered VNC console for vm instances |
|
| 13 |
+NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git |
|
| 14 |
+NOVNC_BRANCH=master |
|
| 15 |
+ |
|
| 16 |
+# django powered web control panel for openstack |
|
| 17 |
+DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git |
|
| 18 |
+DASH_BRANCH=service_catalog_compute |
|
| 19 |
+ |
|
| 20 |
+# add nixon, will use this to show munin graphs in dashboard |
|
| 21 |
+NIXON_REPO=https://github.com/cloudbuilders/nixon.git |
|
| 22 |
+NIXON_BRANCH=diablo |
|
| 23 |
+ |
|
| 24 |
+# python client library to nova that dashboard (and others) use |
|
| 25 |
+NOVACLIENT_REPO=https://github.com/cloudbuilders/python-novaclient.git |
|
| 26 |
+NOVACLIENT_BRANCH=rackspace_master |
|
| 27 |
+ |
|
| 28 |
+# openstackx is a collection of extensions to openstack.compute & nova |
|
| 29 |
+# that is *deprecated*. The code is being moved into python-novaclient & nova. |
|
| 30 |
+OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git |
|
| 31 |
+OPENSTACKX_BRANCH=diablo |
|
| 32 |
+ |
|
| 33 |
+# openstack-munin is a collection of munin plugins for monitoring the stack |
|
| 34 |
+MUNIN_REPO=https://github.com/cloudbuilders/openstack-munin.git |
|
| 35 |
+MUNIN_BRANCH=master |
| 0 | 36 |
deleted file mode 100644 |
| ... | ... |
@@ -1,36 +0,0 @@ |
| 1 |
-# compute service |
|
| 2 |
-NOVA_REPO=https://github.com/openstack/nova.git |
|
| 3 |
-NOVA_BRANCH=2011.3 |
|
| 4 |
- |
|
| 5 |
-# image catalog service |
|
| 6 |
-GLANCE_REPO=https://github.com/cloudbuilders/glance.git |
|
| 7 |
-GLANCE_BRANCH=diablo |
|
| 8 |
- |
|
| 9 |
-# unified auth system (manages accounts/tokens) |
|
| 10 |
-KEYSTONE_REPO=https://github.com/cloudbuilders/keystone.git |
|
| 11 |
-KEYSTONE_BRANCH=diablo |
|
| 12 |
- |
|
| 13 |
-# a websockets/html5 or flash powered VNC console for vm instances |
|
| 14 |
-NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git |
|
| 15 |
-NOVNC_BRANCH=master |
|
| 16 |
- |
|
| 17 |
-# django powered web control panel for openstack |
|
| 18 |
-DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git |
|
| 19 |
-DASH_BRANCH=master |
|
| 20 |
- |
|
| 21 |
-# add nixon, will use this to show munin graphs in dashboard |
|
| 22 |
-NIXON_REPO=https://github.com/cloudbuilders/nixon.git |
|
| 23 |
-NIXON_BRANCH=diablo |
|
| 24 |
- |
|
| 25 |
-# python client library to nova that dashboard (and others) use |
|
| 26 |
-NOVACLIENT_REPO=https://github.com/cloudbuilders/python-novaclient.git |
|
| 27 |
-NOVACLIENT_BRANCH=master |
|
| 28 |
- |
|
| 29 |
-# openstackx is a collection of extensions to openstack.compute & nova |
|
| 30 |
-# that is *deprecated*. The code is being moved into python-novaclient & nova. |
|
| 31 |
-OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git |
|
| 32 |
-OPENSTACKX_BRANCH=diablo |
|
| 33 |
- |
|
| 34 |
-# openstack-munin is a collection of munin plugins for monitoring the stack |
|
| 35 |
-MUNIN_REPO=https://github.com/cloudbuilders/openstack-munin.git |
|
| 36 |
-MUNIN_BRANCH=master |