From fd22b2346e64d16a4231ea21683cdd765407710a Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Thu, 25 Sep 2014 22:14:26 -0700
Subject: Make build tools build with kollaglue login

Build with kollaglue login.  Then we can upload all images under
that user namespace.
---
 docker/keystone/build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docker/keystone')

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 .
-- 
cgit v1.2.3


From 7bb837fc656a9819c4447eb74a9c1650942e923c Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Thu, 25 Sep 2014 13:54:19 -0700
Subject: Add a push script for each of the separate daemons

This pushes to the docker registry.
---
 docker/cinder/push                   | 2 ++
 docker/fedora-rdo-base/push          | 2 ++
 docker/glance/glance-api/push        | 2 ++
 docker/glance/glance-base/push       | 2 ++
 docker/glance/glance-registry/push   | 2 ++
 docker/heat/heat-api/push            | 2 ++
 docker/heat/heat-base/push           | 2 ++
 docker/heat/heat-engine/push         | 2 ++
 docker/keystone/push                 | 2 ++
 docker/mariadb/push                  | 2 ++
 docker/rabbitmq/push                 | 2 ++
 docker/swift/swift-account/push      | 2 ++
 docker/swift/swift-base/push         | 2 ++
 docker/swift/swift-container/push    | 2 ++
 docker/swift/swift-object/push       | 2 ++
 docker/swift/swift-proxy-server/push | 2 ++
 16 files changed, 32 insertions(+)
 create mode 100755 docker/cinder/push
 create mode 100755 docker/fedora-rdo-base/push
 create mode 100755 docker/glance/glance-api/push
 create mode 100755 docker/glance/glance-base/push
 create mode 100755 docker/glance/glance-registry/push
 create mode 100755 docker/heat/heat-api/push
 create mode 100755 docker/heat/heat-base/push
 create mode 100755 docker/heat/heat-engine/push
 create mode 100755 docker/keystone/push
 create mode 100755 docker/mariadb/push
 create mode 100755 docker/rabbitmq/push
 create mode 100755 docker/swift/swift-account/push
 create mode 100755 docker/swift/swift-base/push
 create mode 100755 docker/swift/swift-container/push
 create mode 100755 docker/swift/swift-object/push
 create mode 100755 docker/swift/swift-proxy-server/push

(limited to 'docker/keystone')

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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 .
-- 
cgit v1.2.3


From dfb9faedda9d5fcb47f0b773f0e9b3ab3aed738f Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Sat, 27 Sep 2014 12:29:13 -0700
Subject: Make keystone use stderr

We want all log output to go to stderr so it can be debugged later.
---
 docker/keystone/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docker/keystone')

diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 922511c95..8319c0cf7 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -7,6 +7,8 @@ RUN yum install -y openstack-keystone \
 	mariadb \
 	&& yum clean all
 
+RUN crudini --set /etc/keystone/keystone.conf DEFAULT use_stderr True
+
 ADD ./start.sh /start.sh
 
 CMD ["/start.sh"]
-- 
cgit v1.2.3


From cca017d44ca6ad5bfdf877afeb510db45cce336c Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Sat, 27 Sep 2014 12:31:12 -0700
Subject: Pull mariadb and keystone images from the kollaglue organization

Presently these are pulled from a closed location inside a firewall.  Instead
pull them from the public docker registry.
---
 docker/keystone/keystone.json | 2 +-
 docker/mariadb/mariadb.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'docker/keystone')

diff --git a/docker/keystone/keystone.json b/docker/keystone/keystone.json
index 89adcd31b..2a72efe2b 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/keystone",
         "ports": [
 		{"containerPort": 5000},
 		{"containerPort": 35357},
diff --git a/docker/mariadb/mariadb.json b/docker/mariadb/mariadb.json
index 01071d425..8972ea661 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-osp-mariadb",
         "env": [{
 	  'name': 'DB_ROOT_PASSWORD',
 	  'value': 'password'
-- 
cgit v1.2.3


From 9c7f0622a712bb95986636a3b7764018195ab815 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Sat, 27 Sep 2014 14:06:39 -0700
Subject: Point to fedora-rdo-* for image names

---
 docker/keystone/keystone.json | 2 +-
 docker/mariadb/mariadb.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'docker/keystone')

diff --git a/docker/keystone/keystone.json b/docker/keystone/keystone.json
index 2a72efe2b..2f707583d 100644
--- a/docker/keystone/keystone.json
+++ b/docker/keystone/keystone.json
@@ -6,7 +6,7 @@
       "id": "keystone-1",
       "containers": [{
         "name": "keystone",
-        "image": "kollaglue/keystone",
+        "image": "kollaglue/fedora-rdo-keystone",
         "ports": [
 		{"containerPort": 5000},
 		{"containerPort": 35357},
diff --git a/docker/mariadb/mariadb.json b/docker/mariadb/mariadb.json
index 8972ea661..4d04f2d17 100644
--- a/docker/mariadb/mariadb.json
+++ b/docker/mariadb/mariadb.json
@@ -6,7 +6,7 @@
       "id": "mariadb-1",
       "containers": [{
         "name": "mariadb",
-        "image": "kollaglue/fedora-osp-mariadb",
+        "image": "kollaglue/fedora-rdo-mariadb",
         "env": [{
 	  'name': 'DB_ROOT_PASSWORD',
 	  'value': 'password'
-- 
cgit v1.2.3


From 1e6f8114c85b8dff4630bf11f6179d0e52e5dedf Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Sat, 27 Sep 2014 16:03:02 -0700
Subject: Setup pki_setup on initial setup of keystone

Need PKI setup for keystone to operate.
---
 docker/keystone/Dockerfile | 2 --
 docker/keystone/start.sh   | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'docker/keystone')

diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 8319c0cf7..922511c95 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -7,8 +7,6 @@ RUN yum install -y openstack-keystone \
 	mariadb \
 	&& yum clean all
 
-RUN crudini --set /etc/keystone/keystone.conf DEFAULT use_stderr True
-
 ADD ./start.sh /start.sh
 
 CMD ["/start.sh"]
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index a1425fb08..130afe11a 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -31,9 +31,12 @@ 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
 
 /usr/bin/keystone-manage db_sync
 
+/usr/bin/keystone-manage pki_setup
+
 /usr/bin/keystone-all &
 PID=$!
 
-- 
cgit v1.2.3


From a7b17d70a3ecd6c2b5a76a846c812482d8e46e08 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Sat, 27 Sep 2014 19:00:09 -0700
Subject: Use pki_setup to set up keystone properly

---
 docker/keystone/start.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docker/keystone')

diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index 130afe11a..044cf4725 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -33,9 +33,11 @@ crudini --del /etc/keystone/keystone.conf \
 	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
+/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
 
 /usr/bin/keystone-all &
 PID=$!
-- 
cgit v1.2.3