Merge pull request #8 from sdake/master

build and push to kollaglue account

38 files changed, 70 insertions, 19 deletions

diff --git a/docker/build b/docker/build
index 56831ba04..eea68befe 100755
--- a/docker/build
+++ b/docker/build
@@ -4,9 +4,11 @@
 CONTAINERS=(fedora-rdo-base cinder glance/glance-base glance/glance-api glance/glance-registry heat/heat-base heat/heat-api heat/heat-engine keystone mariadb rabbitmq swift/swift-base swift/swift-account swift/swift-container swift/swift-object swift/swift-proxy-server)
 
 for IMAGE in ${CONTAINERS[@]}; do
-        echo "Building $IMAGE"
         pushd .
         cd ${IMAGE}
+        echo "Building $IMAGE"
         ./build
+        echo "Pushing $IMAGE"
+        ./push
         popd
 done
diff --git a/docker/cinder/build b/docker/cinder/build
index 6a1b9d713..66081e4e0 100755
--- a/docker/cinder/build
+++ b/docker/cinder/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-cinder .
+docker build --tag kollaglue/fedora-rdo-cinder .
diff --git a/docker/cinder/push b/docker/cinder/push
new file mode 100755
index 000000000..58795abb0
--- /dev/null
+++ b/docker/cinder/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-cinder .
diff --git a/docker/fedora-rdo-base/build b/docker/fedora-rdo-base/build
index 918aff44d..8e5867b88 100755
--- a/docker/fedora-rdo-base/build
+++ b/docker/fedora-rdo-base/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-base .
+docker build --tag kollaglue/fedora-rdo-base .
diff --git a/docker/fedora-rdo-base/push b/docker/fedora-rdo-base/push
new file mode 100755
index 000000000..ed6c6029b
--- /dev/null
+++ b/docker/fedora-rdo-base/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-base .
diff --git a/docker/glance/glance-api/build b/docker/glance/glance-api/build
index 8e403a9a7..88434b114 100755
--- a/docker/glance/glance-api/build
+++ b/docker/glance/glance-api/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-glance-api .
+docker build --tag kollaglue/fedora-rdo-glance-api .
diff --git a/docker/glance/glance-api/push b/docker/glance/glance-api/push
new file mode 100755
index 000000000..6c1edacbe
--- /dev/null
+++ b/docker/glance/glance-api/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-glance-api .
diff --git a/docker/glance/glance-base/build b/docker/glance/glance-base/build
index 9a3a500c9..75a42b8a0 100755
--- a/docker/glance/glance-base/build
+++ b/docker/glance/glance-base/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-glance-base .
+docker build --tag kollaglue/fedora-rdo-glance-base .
diff --git a/docker/glance/glance-base/push b/docker/glance/glance-base/push
new file mode 100755
index 000000000..3de87a26c
--- /dev/null
+++ b/docker/glance/glance-base/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-glance-base .
diff --git a/docker/glance/glance-registry/build b/docker/glance/glance-registry/build
index 8c3c0d476..47e88f5ef 100755
--- a/docker/glance/glance-registry/build
+++ b/docker/glance/glance-registry/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-glance-registry .
+docker build --tag kollaglue/fedora-rdo-glance-registry .
diff --git a/docker/glance/glance-registry/push b/docker/glance/glance-registry/push
new file mode 100755
index 000000000..f69cca5a1
--- /dev/null
+++ b/docker/glance/glance-registry/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-glance-registry .
diff --git a/docker/heat/heat-api/build b/docker/heat/heat-api/build
index 5c63fdb17..16a5acc1d 100755
--- a/docker/heat/heat-api/build
+++ b/docker/heat/heat-api/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-heat-api .
+docker build --tag kollaglue/fedora-rdo-heat-api .
diff --git a/docker/heat/heat-api/push b/docker/heat/heat-api/push
new file mode 100755
index 000000000..3ab396aee
--- /dev/null
+++ b/docker/heat/heat-api/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-heat-api .
diff --git a/docker/heat/heat-base/build b/docker/heat/heat-base/build
index 937f25970..e20076c89 100755
--- a/docker/heat/heat-base/build
+++ b/docker/heat/heat-base/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-heat-base .
+docker build --tag kollaglue/fedora-rdo-heat-base .
diff --git a/docker/heat/heat-base/push b/docker/heat/heat-base/push
new file mode 100755
index 000000000..ef525ec87
--- /dev/null
+++ b/docker/heat/heat-base/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-heat-base .
diff --git a/docker/heat/heat-engine/build b/docker/heat/heat-engine/build
index b83ee2819..1a2f7ccbb 100755
--- a/docker/heat/heat-engine/build
+++ b/docker/heat/heat-engine/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-heat-engine .
+docker build --tag kollaglue/fedora-rdo-heat-engine .
diff --git a/docker/heat/heat-engine/push b/docker/heat/heat-engine/push
new file mode 100755
index 000000000..9948eb100
--- /dev/null
+++ b/docker/heat/heat-engine/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-heat-engine .
diff --git a/docker/keystone/build b/docker/keystone/build
index a92662c05..a1b40c837 100755
--- a/docker/keystone/build
+++ b/docker/keystone/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-keystone .
+docker build --tag kollaglue/fedora-rdo-keystone .
diff --git a/docker/keystone/keystone.json b/docker/keystone/keystone.json
index 89adcd31b..2f707583d 100644
--- a/docker/keystone/keystone.json
+++ b/docker/keystone/keystone.json
@@ -6,7 +6,7 @@
       "id": "keystone-1",
       "containers": [{
         "name": "keystone",
-        "image": "docker.usersys.redhat.com/jlabocki/keystone",
+        "image": "kollaglue/fedora-rdo-keystone",
         "ports": [
 		{"containerPort": 5000},
 		{"containerPort": 35357},
diff --git a/docker/keystone/push b/docker/keystone/push
new file mode 100755
index 000000000..5e7bc88cb
--- /dev/null
+++ b/docker/keystone/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-keystone .
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index a1425fb08..044cf4725 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -31,9 +31,14 @@ crudini --del /etc/keystone/keystone.conf \
 crudini --del /etc/keystone/keystone.conf \
 	DEFAULT \
 	log_dir
+crudini --set /etc/keystone/keystone.conf DEFAULT use_stderr True
+
+cat /etc/keystone/keystone.conf
 
 /usr/bin/keystone-manage db_sync
 
+/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+
 /usr/bin/keystone-all &
 PID=$!
 
diff --git a/docker/mariadb/build b/docker/mariadb/build
index 7493d7654..ef2c05ddc 100755
--- a/docker/mariadb/build
+++ b/docker/mariadb/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-mariadb .
+docker build --tag kollaglue/fedora-rdo-mariadb .
diff --git a/docker/mariadb/mariadb.json b/docker/mariadb/mariadb.json
index 01071d425..4d04f2d17 100644
--- a/docker/mariadb/mariadb.json
+++ b/docker/mariadb/mariadb.json
@@ -6,7 +6,7 @@
       "id": "mariadb-1",
       "containers": [{
         "name": "mariadb",
-        "image": "docker.usersys.redhat.com/lhh1/rhel-osp-mariadb",
+        "image": "kollaglue/fedora-rdo-mariadb",
         "env": [{
 	  'name': 'DB_ROOT_PASSWORD',
 	  'value': 'password'
diff --git a/docker/mariadb/push b/docker/mariadb/push
new file mode 100755
index 000000000..da6da778d
--- /dev/null
+++ b/docker/mariadb/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-mariadb .
diff --git a/docker/rabbitmq/build b/docker/rabbitmq/build
index 3636a3631..295844249 100755
--- a/docker/rabbitmq/build
+++ b/docker/rabbitmq/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-rabbitmq .
+docker build --tag kollaglue/fedora-rdo-rabbitmq .
diff --git a/docker/rabbitmq/push b/docker/rabbitmq/push
new file mode 100755
index 000000000..f4dcc1fce
--- /dev/null
+++ b/docker/rabbitmq/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-rabbitmq .
diff --git a/docker/swift/swift-account/build b/docker/swift/swift-account/build
index e6f866864..9db06bce9 100755
--- a/docker/swift/swift-account/build
+++ b/docker/swift/swift-account/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-swift-account-server .
+docker build --tag kollaglue/fedora-rdo-swift-account-server .
diff --git a/docker/swift/swift-account/push b/docker/swift/swift-account/push
new file mode 100755
index 000000000..e0aad88b9
--- /dev/null
+++ b/docker/swift/swift-account/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-account .
diff --git a/docker/swift/swift-base/build b/docker/swift/swift-base/build
index 374471486..b6dd0369b 100755
--- a/docker/swift/swift-base/build
+++ b/docker/swift/swift-base/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-swift-base .
+docker build --tag kollaglue/fedora-rdo-swift-base .
diff --git a/docker/swift/swift-base/push b/docker/swift/swift-base/push
new file mode 100755
index 000000000..2f0213c4d
--- /dev/null
+++ b/docker/swift/swift-base/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-base .
diff --git a/docker/swift/swift-container/build b/docker/swift/swift-container/build
index da13449cf..949f7ac4c 100755
--- a/docker/swift/swift-container/build
+++ b/docker/swift/swift-container/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-swift-container-server .
+docker build --tag kollaglue/fedora-rdo-swift-container-server .
diff --git a/docker/swift/swift-container/push b/docker/swift/swift-container/push
new file mode 100755
index 000000000..a805879a3
--- /dev/null
+++ b/docker/swift/swift-container/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-container .
diff --git a/docker/swift/swift-object/build b/docker/swift/swift-object/build
index 44a80f3a0..eee05d6a9 100755
--- a/docker/swift/swift-object/build
+++ b/docker/swift/swift-object/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-swift-object-server .
+docker build --tag kollaglue/fedora-rdo-swift-object-server .
diff --git a/docker/swift/swift-object/push b/docker/swift/swift-object/push
new file mode 100755
index 000000000..7f05b6379
--- /dev/null
+++ b/docker/swift/swift-object/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-object .
diff --git a/docker/swift/swift-proxy-server/build b/docker/swift/swift-proxy-server/build
index 804cd4e5d..87de199be 100755
--- a/docker/swift/swift-proxy-server/build
+++ b/docker/swift/swift-proxy-server/build
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-swift-proxy-server .
+docker build --tag kollaglue/fedora-rdo-swift-proxy-server .
diff --git a/docker/swift/swift-proxy-server/push b/docker/swift/swift-proxy-server/push
new file mode 100755
index 000000000..60208c931
--- /dev/null
+++ b/docker/swift/swift-proxy-server/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-proxy .
diff --git a/tools/start b/tools/start
new file mode 100755
index 000000000..718e33847
--- /dev/null
+++ b/tools/start
@@ -0,0 +1,6 @@
+kubecfg -c ../docker/mariadb/mariadb.json create pods
+kubecfg -c ../docker/keystone/keystone.json create pods
+
+kubecfg -c ../docker/mariadb/mariadb-service.json create services
+kubecfg -c ../docker/keystone/keystone-service-5000.json create services
+kubecfg -c ../docker/keystone/keystone-service-35357.json create services
diff --git a/tools/stop b/tools/stop
new file mode 100755
index 000000000..0d7f99495
--- /dev/null
+++ b/tools/stop
@@ -0,0 +1,6 @@
+kubecfg delete /pods/mariadb
+kubecfg delete /pods/keystone
+
+kubecfg delete /services/mariadbmaster
+kubecfg delete /services/keystonemaster-5000
+kubecfg delete /services/keystonemaster-35357