Merge "update start/stop scripts"

6 files changed, 55 insertions, 10 deletions

diff --git a/tools/start b/tools/start
index ed36e0808..2daad084e 100755
--- a/tools/start
+++ b/tools/start
@@ -1,6 +1,6 @@
-kubecfg -c ../k8s/service/mariadb-service.json create services
-kubecfg -c ../k8s/service/keystone-public-service.json create services
-kubecfg -c ../k8s/service/keystone-admin-service.json create services
+#!/bin/sh
 
-kubecfg -c ../k8s/pod/mariadb-pod.json create pods
-kubecfg -c ../k8s/pod/keystone-pod.json create pods
+cd $(git rev-parse --show-toplevel)
+
+./tools/start-all-services
+./tools/start-all-pods
diff --git a/tools/start-all-pods b/tools/start-all-pods
new file mode 100755
index 000000000..9af11b38b
--- /dev/null
+++ b/tools/start-all-pods
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+cd $(git rev-parse --show-toplevel)
+
+pods='
+rabbitmq
+mariadb
+keystone
+glance
+'
+
+for pod in $pods; do
+    kubecfg -c "k8s/pod/${pod}-pod.yaml" create pods
+done
+
diff --git a/tools/start-all-services b/tools/start-all-services
new file mode 100755
index 000000000..b9b5cfd56
--- /dev/null
+++ b/tools/start-all-services
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+cd $(git rev-parse --show-toplevel)
+
+services='
+glance-api
+glance-registry
+keystone-admin
+keystone-public
+mariadb
+rabbitmq
+'
+
+for svc in $services; do
+    kubecfg -c "k8s/service/${svc}-service.yaml" create services
+done
+
diff --git a/tools/stop b/tools/stop
index 084194cb8..12d4e36f5 100755
--- a/tools/stop
+++ b/tools/stop
@@ -1,6 +1,7 @@
-kubecfg delete /pods/mariadb
-kubecfg delete /pods/keystone
+#!/bin/sh
+
+cd $(git rev-parse --show-toplevel)
+
+./tools/stop-all-pods
+./tools/stop-all-services
 
-kubecfg delete /services/mariadb
-kubecfg delete /services/keystone-public
-kubecfg delete /services/keystone-admin
diff --git a/tools/stop-all-pods b/tools/stop-all-pods
new file mode 100755
index 000000000..4fe4b80d7
--- /dev/null
+++ b/tools/stop-all-pods
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+kubecfg list pods |
+    awk 'NR>2 {print $1}' |
+    xargs -i kubecfg delete pods/{}
+
diff --git a/tools/stop-all-services b/tools/stop-all-services
new file mode 100755
index 000000000..c76c24439
--- /dev/null
+++ b/tools/stop-all-services
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+kubecfg list services |
+    awk 'NR>2 {print $1}' |
+    xargs -i kubecfg delete services/{}
+