From 55d5713f19d81731903eac4e89020c58b37f4842 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 5 Jul 2012 16:39:57 +0100 Subject: [PATCH] heat tools : whitespace cleanup in tools/openstack Convert mixed tabs/spaces to all spaces Change-Id: I3c75ead59afad8a7edf24d8fc6c1c0484dbcd3eb Signed-off-by: Steven Hardy --- tools/openstack | 290 ++++++++++++++++++++++++------------------------ 1 file changed, 145 insertions(+), 145 deletions(-) diff --git a/tools/openstack b/tools/openstack index 236f9801..59beb93b 100755 --- a/tools/openstack +++ b/tools/openstack @@ -12,105 +12,105 @@ BASE_DIR=`dirname $0` action=$1 if [ -z "$action" ] then - echo "openstack [start|stop|install|erase|status]" - echo "" - echo "This tool is designed to control OpenStack on a Fedora 16/17 system" - echo "" - echo "start - Starts OpenStack" - echo "stop - Stops OpenStack" - echo "install - Installs a fresh OpenStack system with Keystone from RPM repostories" - echo "erase - permanently destroys an existing installation of OpenStack" + echo "openstack [start|stop|install|erase|status]" + echo "" + echo "This tool is designed to control OpenStack on a Fedora 16/17 system" + echo "" + echo "start - Starts OpenStack" + echo "stop - Stops OpenStack" + echo "install - Installs a fresh OpenStack system with Keystone from RPM repostories" + echo "erase - permanently destroys an existing installation of OpenStack" fi function os_status() { - services=(qpidd mysqld openstack-keystone tgtd openstack-glance-api openstack-glance-registry openstack-nova-api openstack-nova-objectstore openstack-nova-compute openstack-nova-network openstack-nova-volume openstack-nova-scheduler openstack-nova-cert) - for service in ${services[@]} - do - output=$(systemctl show "$service.service" --property=ActiveState) - running=(${output//=/ }) #ActiveState=active - echo "$service ${running[1]}" | awk '{ printf "%-40s %s\n", $1, $2}' - done + services=(qpidd mysqld openstack-keystone tgtd openstack-glance-api openstack-glance-registry openstack-nova-api openstack-nova-objectstore openstack-nova-compute openstack-nova-network openstack-nova-volume openstack-nova-scheduler openstack-nova-cert) + for service in ${services[@]} + do + output=$(systemctl show "$service.service" --property=ActiveState) + running=(${output//=/ }) #ActiveState=active + echo "$service ${running[1]}" | awk '{ printf "%-40s %s\n", $1, $2}' + done } function os_start() { - action=start - sudo systemctl $action qpidd.service mysqld.service - sleep 1 - sudo systemctl $action openstack-keystone.service tgtd.service - sleep 1 - for svc in api registry - do - sudo systemctl $action openstack-glance-$svc.service - done - 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 + action=start + sudo systemctl $action qpidd.service mysqld.service + sleep 1 + sudo systemctl $action openstack-keystone.service tgtd.service + sleep 1 + for svc in api registry + do + sudo systemctl $action openstack-glance-$svc.service + done + 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 } function os_stop() { - action=stop - sudo systemctl $action openstack-keystone.service tgtd.service - for svc in api objectstore compute network volume scheduler cert - do - sudo systemctl $action openstack-nova-$svc.service - done - for svc in api registry - do - sudo systemctl $action openstack-glance-$svc.service - done + action=stop + sudo systemctl $action openstack-keystone.service tgtd.service + for svc in api objectstore compute network volume scheduler cert + do + sudo systemctl $action openstack-nova-$svc.service + done + for svc in api registry + do + sudo systemctl $action openstack-glance-$svc.service + done } function os_erase() { - for net in `sudo nova-manage network list | - awk '/^[[:digit:]]/ { print $9 }'` - do - sudo nova-manage network delete --uuid $net - done - - os_stop - sleep 1 - - # Kill dnsmasq processes - if find /var/lib/nova/networks -name '*.pid'; then - sudo kill `cat /var/lib/nova/networks/*.pid` - fi - - sudo rm -f /var/lib/libvirt/qemu/save/instance-000* - sudo rm -f /var/lib/libvirt/qemu/instance-000* - sudo yum erase -y python-glance python-nova* python-keystone* openstack-swift* openstack-dashboard - - sudo systemctl start mysqld.service - sleep 1 - - $BASE_DIR/heat-db-drop nova $* - $BASE_DIR/heat-db-drop keystone $* - $BASE_DIR/heat-db-drop glance $* - - sudo vgchange -an nova-volumes - sudo losetup -d /dev/loop0 - sudo rm -f /var/lib/nova/nova-volumes.img - sudo rm -rf /etc/{glance,nova,swift,keystone,openstack-dashboard} /var/lib/{glance,nova,swift,keystone} /var/log/{glance,nova,swift,keystone} /var/run/{glance,nova,swift,keystone} - rm -f $HOME/.openstack/.keystonerc + for net in `sudo nova-manage network list | + awk '/^[[:digit:]]/ { print $9 }'` + do + sudo nova-manage network delete --uuid $net + done + + os_stop + sleep 1 + + # Kill dnsmasq processes + if find /var/lib/nova/networks -name '*.pid'; then + sudo kill `cat /var/lib/nova/networks/*.pid` + fi + + sudo rm -f /var/lib/libvirt/qemu/save/instance-000* + sudo rm -f /var/lib/libvirt/qemu/instance-000* + sudo yum erase -y python-glance python-nova* python-keystone* openstack-swift* openstack-dashboard + + sudo systemctl start mysqld.service + sleep 1 + + $BASE_DIR/heat-db-drop nova $* + $BASE_DIR/heat-db-drop keystone $* + $BASE_DIR/heat-db-drop glance $* + + sudo vgchange -an nova-volumes + sudo losetup -d /dev/loop0 + sudo rm -f /var/lib/nova/nova-volumes.img + sudo rm -rf /etc/{glance,nova,swift,keystone,openstack-dashboard} /var/lib/{glance,nova,swift,keystone} /var/log/{glance,nova,swift,keystone} /var/run/{glance,nova,swift,keystone} + rm -f $HOME/.openstack/.keystonerc } function os_install() { - sudo yum groupinstall -y Virtualization - sudo yum install -y openstack-utils openstack-nova openstack-glance openstack-keystone openstack-dashboard scsi-target-utils qpid-cpp-server mysql-server - 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 - # Configure the databases - sudo openstack-db --service nova --init - sudo openstack-db --service glance --init - sudo openstack-db --service keystone --init - - # Create a keystone RC file - mkdir -p $HOME/.openstack - cat > $HOME/.openstack/keystonerc < $HOME/.openstack/keystonerc <