Merge pull request #8 from sdake/master

build and push to kollaglue account

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

docker/cinder/build

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-cinder .
+docker build --tag kollaglue/fedora-rdo-cinder .

docker/cinder/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-cinder .

docker/fedora-rdo-base/build

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-base .
+docker build --tag kollaglue/fedora-rdo-base .

docker/fedora-rdo-base/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-base .

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 .

docker/glance/glance-api/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-glance-api .

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 .

docker/glance/glance-base/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-glance-base .

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 .

docker/glance/glance-registry/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-glance-registry .

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 .

docker/heat/heat-api/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-heat-api .

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 .

docker/heat/heat-base/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-heat-base .

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 .

docker/heat/heat-engine/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-heat-engine .

docker/keystone/build

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-keystone .
+docker build --tag kollaglue/fedora-rdo-keystone .

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},

docker/keystone/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-keystone .

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=$!
 

docker/mariadb/build

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-mariadb .
+docker build --tag kollaglue/fedora-rdo-mariadb .

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'

docker/mariadb/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-mariadb .

docker/rabbitmq/build

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --tag fedora-rdo-rabbitmq .
+docker build --tag kollaglue/fedora-rdo-rabbitmq .

docker/rabbitmq/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-rabbitmq .

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 .

docker/swift/swift-account/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-account .

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 .

docker/swift/swift-base/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-base .

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 .

docker/swift/swift-container/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-container .

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 .

docker/swift/swift-object/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-object .

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 .

docker/swift/swift-proxy-server/push

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-proxy .

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

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