Permalink
Browse files

Fixup settings.local import, keystone-data mistake, and add clean-all.sh

  • Loading branch information...
1 parent 5dbc6cc commit 9228a41bd1737158771dcb8499037733a3146b99 root committed Nov 20, 2011
Showing with 19 additions and 9 deletions.
  1. +10 −0 clean-all.sh
  2. +2 −2 keystone_data.sh.tmpl
  3. +7 −7 settings
View
10 clean-all.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+./clean.sh
+
+PACKAGES=`dpkg -l | grep -E "(openstack|nova|keystone|glance|swift)" | grep -v "kohana" | cut -d" " -f3 | tr "\\n" " "`
+
+apt-get purge $PACKAGES
+
+rm -rf /etc/nova /etc/glance /etc/keystone /etc/swift /etc/openstack-dashboard
+rm -rf /var/lib/nova /var/lib/glance /var/lib/keystone /var/lib/swift /var/lib/openstack-dashboard
View
4 keystone_data.sh.tmpl
@@ -28,9 +28,9 @@ keystone-manage endpointTemplates add %REGION% keystone http://%HOST_IP%:5000/v2
# keystone-manage endpointTemplates add %REGION% swift http://%HOST_IP%:8080/v1/AUTH_%tenant_id% http://%HOST_IP%:8080/ http://%HOST_IP%:8080/v1/AUTH_%tenant_id% 1 1
# Tokens
-$BIN_DIR/keystone-manage token add %SERVICE_TOKEN% admin admin 2015-02-05T00:00
+keystone-manage token add %SERVICE_TOKEN% admin admin 2015-02-05T00:00
# EC2 related creds - note we are setting the token to user_password
# but keystone doesn't parse them - it is just a blob from keystone's
# point of view
-keystone-manage $* credentials add admin EC2 'admin_%ADMIN_PASSWORD%' admin admin || echo "no support for adding credentials"
+keystone-manage credentials add admin EC2 'admin_%ADMIN_PASSWORD%' admin admin || echo "no support for adding credentials"
View
14 settings
@@ -7,7 +7,6 @@
MYSQL_USER="root"
MYSQL_PASS="letmein"
MYSQL_HOST="127.0.0.1"
-MYSQL_CONN="mysql://$MYSQL_USER:$MYSQL_PASS@$MYSQL_HOST"
# Controller Node
HOST_IP="127.0.0.1" # Do actually change this! This should be an IP address accessible by your end users. Not 127.0.0.1.
@@ -27,7 +26,14 @@ FIXED_RANGE_MASK="255.240.0.0"
# Misc
REGION="nova" # Region name - "nova" is the default, and probably the most reliable withoit extra setup!
+# Load overrides from settings.local if it exists
+if [ -f settings.local ]
+then
+ . settings.local
+fi
+
# Dont change anything below here!
+MYSQL_CONN="mysql://$MYSQL_USER:$MYSQL_PASS@$MYSQL_HOST"
FIXED_RANGE="${FIXED_RANGE_NET}/${FIXED_RANGE_BITS}"
export NOVA_PROJECT_ID="admin" # Tenant
export NOVA_USERNAME="admin" # Username
@@ -37,9 +43,3 @@ export NOVA_VERSION=1.1
export NOVA_REGION_NAME=$REGION
COUNT=1
-
-# Load overrides from settings.local if it exists
-if [ -f settings.local ]
-then
- . settings.local
-fi

0 comments on commit 9228a41

Please sign in to comment.