From 7d290c20327ae24e618ab4230a50769d62a53e48 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Thu, 22 Mar 2012 23:54:46 -0700
Subject: [PATCH] install/erase working better

nova command operations not quite right yet

Signed-off-by: Steven Dake <sdake@redhat.com>
---
 tools/openstack | 84 +++++++++++++++++++++++++++----------------------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/tools/openstack b/tools/openstack
index 15ea8ef2..d570c2b0 100755
--- a/tools/openstack
+++ b/tools/openstack
@@ -1,4 +1,11 @@
 #!/bin/bash
+# Copyright (C) 2012
+# Authors:
+# Angus Salkeld
+# Steven Dake
+# ASL2.0
+
+# sleep 1 = systemd's definition of start is different from mine
 
 
 action=$1
@@ -10,17 +17,18 @@ fi
 function os_start() {
 	action=start
 	sudo systemctl $action qpidd.service mysqld.service
+	sleep 1
+	sudo systemctl $action openstack-keystone.service
+	sleep 1
 	for svc in api registry
 	do
 		sudo systemctl $action openstack-glance-$svc.service
 	done
-	sudo dd if=/dev/zero of=/var/lib/nova/nova-volumes.img bs=1M seek=20k count=0
 	sudo vgcreate nova-volumes $(sudo losetup --show -f /var/lib/nova/nova-volumes.img)
 	for svc in api objectstore compute network volume scheduler cert
 	do
 	       sudo systemctl $action openstack-nova-$svc.service
 	done
-	sudo systemctl $action openstack-keystone.service
 }
 
 function os_stop() {
@@ -37,13 +45,26 @@ function os_stop() {
 }
 
 function os_erase() {
-	sudo rm -f /var/lib/libvirt/qemu/save/instance-00000*
+	os_stop
+	sleep 1
+	sudo rm -f /var/lib/libvirt/qemu/save/instance-000*
+	sudo rm -f /var/lib/libvirt/qemu/instance-000*
 	for iii in /usr/lib/systemd/system/openstack-*.service; do sudo systemctl stop $(basename $iii); done
-	sudo yum erase -y python-glance python-nova* python-keystone* openstack-swift*
+	sudo yum erase -y python-glance python-nova* python-keystone* openstack-swift* openstack-dashboard
 
 	sudo systemctl start mysqld.service
-	mysql -u root -p -e 'drop database nova;'
-	mysql -u root -p -e 'drop database keystone;'
+	sleep 1
+
+cat << EOF | mysql -u root -p
+DROP USER 'nova'@'localhost';
+DROP USER 'nova'@'%';
+DROP USER 'keystone'@'localhost';
+DROP USER 'keystone'@'%';
+DROP DATABASE nova;
+DROP DATABASE keystone;
+flush privileges;
+EOF
+
 	sudo vgchange -an nova-volumes
 	sudo losetup -d /dev/loop0
 	sudo rm -f /var/lib/nova/nova-volumes.img
@@ -54,57 +75,44 @@ function os_erase() {
 
 
 function os_install() {
-	sudo yum install -y openstack-nova openstack-glance openstack-keystone 
+	sudo yum install -y openstack-nova openstack-glance openstack-keystone openstack-dashboard
+	sudo dd if=/dev/zero of=/var/lib/nova/nova-volumes.img bs=1M seek=20k count=0
 	sudo systemctl start mysqld.service
+	sleep 1
 	sudo openstack-nova-db-setup
-	
 	os_start
-	sudo systemctl stop openstack-keystone.service
-
-	sudo nova-manage user admin $USERNAME
-	sudo nova-manage project create hotproject $USERNAME
-	sudo nova-manage network create hotnet 192.168.155.0/24 1 256 --bridge=hotbr0
-
-	pushd $HOME/
-		sudo nova-manage project zipfile hotproject $USERNAME
-		sudo chmod 600 nova.zip
-		sudo chown $USERNAME:$USERNAME nova.zip
-	popd
-
+	sleep 1
 	mkdir -p $HOME/.openstack
-	pushd $HOME/.openstack
-		unzip ../nova.zip
-		rm ../nova.zip
-		. ./novarc
-		euca-add-keypair nova_key > nova_key.priv
-		chmod 600 nova*
-	popd
-	cd -
 
 	sudo openstack-keystone-db-setup
 
 	cat > $HOME/.openstack/keystonerc <<EOF
 export ADMIN_TOKEN=$(openssl rand -hex 10)
-export OS_USERNAME=$USERNAME
-export OS_PASSWORD=heater
-export OS_TENANT_NAME=hotproject
+export OS_USERNAME=admin
+export OS_PASSWORD=verybadpass
+export OS_TENANT_NAME=admin
 export OS_AUTH_URL=http://127.0.0.1:5000/v2.0/
+export OS_AUTH_STRATEGY=keystone
 EOF
-	. $HOME/.openstack/keystonerc
+	os_stop
+	sleep 1
+	source $HOME/.openstack/keystonerc
 	sudo openstack-config-set /etc/keystone/keystone.conf DEFAULT admin_token $ADMIN_TOKEN
-	sudo systemctl start openstack-keystone.service
+	os_start
+	sleep 1
 	sudo ADMIN_PASSWORD=$OS_PASSWORD openstack-keystone-sample-data
-	keystone user-list
 	sudo sed -i -e 's/# \(pipeline = .*\keystone\)/\1/g' /etc/nova/api-paste.ini
 	sudo openstack-config-set /etc/nova/api-paste.ini filter:authtoken admin_token $ADMIN_TOKEN
-	sudo systemctl restart openstack-nova-api.service
-	nova flavor-list
 	sudo openstack-config-set /etc/glance/glance-api.conf paste_deploy flavor keystone
 	sudo openstack-config-set /etc/glance/glance-registry.conf paste_deploy flavor keystone
 	sudo openstack-config-set /etc/glance/glance-api-paste.ini filter:authtoken admin_token $ADMIN_TOKEN
 	sudo openstack-config-set /etc/glance/glance-registry-paste.ini filter:authtoken admin_token $ADMIN_TOKEN
-	sudo systemctl restart openstack-glance-api.service
-	sudo systemctl restart openstack-glance-registry.service
+	os_stop
+	sleep 1
+	os_start
+	sleep 1
+	echo IF ERRORS RETURNED HERE THE INSTALL DID NOT WORK PROPERLY
+	nova flavor-list
 	glance index
 }
 
-- 
2.45.2