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: [PATCH 01/10] Make build tools build with kollaglue login
Build with kollaglue login. Then we can upload all images under
that user namespace.
---
docker/cinder/build | 2 +-
docker/fedora-rdo-base/build | 2 +-
docker/glance/glance-api/build | 2 +-
docker/glance/glance-base/build | 2 +-
docker/glance/glance-registry/build | 2 +-
docker/heat/heat-api/build | 2 +-
docker/heat/heat-base/build | 2 +-
docker/heat/heat-engine/build | 2 +-
docker/keystone/build | 2 +-
docker/mariadb/build | 2 +-
docker/rabbitmq/build | 2 +-
docker/swift/swift-account/build | 2 +-
docker/swift/swift-base/build | 2 +-
docker/swift/swift-container/build | 2 +-
docker/swift/swift-object/build | 2 +-
docker/swift/swift-proxy-server/build | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/docker/cinder/build b/docker/cinder/build
index 6a1b9d7134..66081e4e0f 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/fedora-rdo-base/build b/docker/fedora-rdo-base/build
index 918aff44d2..8e5867b88e 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/glance/glance-api/build b/docker/glance/glance-api/build
index 8e403a9a76..88434b1147 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-base/build b/docker/glance/glance-base/build
index 9a3a500c9d..75a42b8a0c 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-registry/build b/docker/glance/glance-registry/build
index 8c3c0d4764..47e88f5ef9 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/heat/heat-api/build b/docker/heat/heat-api/build
index 5c63fdb172..16a5acc1d8 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-base/build b/docker/heat/heat-base/build
index 937f259704..e20076c898 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-engine/build b/docker/heat/heat-engine/build
index b83ee28193..1a2f7ccbb0 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/keystone/build b/docker/keystone/build
index a92662c05e..a1b40c8373 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/mariadb/build b/docker/mariadb/build
index 7493d76544..ef2c05ddcb 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/rabbitmq/build b/docker/rabbitmq/build
index 3636a36311..295844249a 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/swift/swift-account/build b/docker/swift/swift-account/build
index e6f8668646..9db06bce9e 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-base/build b/docker/swift/swift-base/build
index 374471486d..b6dd0369b6 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-container/build b/docker/swift/swift-container/build
index da13449cff..949f7ac4c3 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-object/build b/docker/swift/swift-object/build
index 44a80f3a00..eee05d6a9b 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-proxy-server/build b/docker/swift/swift-proxy-server/build
index 804cd4e5d6..87de199be9 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 .
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: [PATCH 02/10] 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
diff --git a/docker/cinder/push b/docker/cinder/push
new file mode 100755
index 0000000000..58795abb02
--- /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 0000000000..ed6c6029ba
--- /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 0000000000..6c1edacbe3
--- /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 0000000000..3de87a26c8
--- /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 0000000000..f69cca5a17
--- /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 0000000000..3ab396aee3
--- /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 0000000000..ef525ec870
--- /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 0000000000..9948eb1006
--- /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 0000000000..5e7bc88cb1
--- /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 0000000000..da6da778d1
--- /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 0000000000..f4dcc1fce2
--- /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 0000000000..e0aad88b90
--- /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 0000000000..2f0213c4d5
--- /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 0000000000..a805879a32
--- /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 0000000000..7f05b63796
--- /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 0000000000..60208c931c
--- /dev/null
+++ b/docker/swift/swift-proxy-server/push
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker push kollaglue/fedora-rdo-swift-proxy .
From e84b599828556f047a2078e15b90b31be87f0573 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Thu, 25 Sep 2014 13:54:44 -0700
Subject: [PATCH 03/10] Adds the push step for each repo to the master build
Push for each built image
---
docker/build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docker/build b/docker/build
index 56831ba040..eea68befee 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
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: [PATCH 04/10] 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(+)
diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 922511c955..8319c0cf7c 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"]
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: [PATCH 05/10] 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(-)
diff --git a/docker/keystone/keystone.json b/docker/keystone/keystone.json
index 89adcd31b8..2a72efe2bf 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 01071d4254..8972ea6619 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'
From d16e2a3c1ea3c696ff7ae6618ae0f94eaa40c450 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Sat, 27 Sep 2014 13:29:36 -0700
Subject: [PATCH 06/10] Add a start and stop command
Start communicates with kubecfg to start the OpenStack services.
Stop communicates with kubecfg to stpo the OpenStack services.
---
tools/start | 5 +++++
tools/stop | 5 +++++
2 files changed, 10 insertions(+)
create mode 100755 tools/start
create mode 100755 tools/stop
diff --git a/tools/start b/tools/start
new file mode 100755
index 0000000000..964ede0bbc
--- /dev/null
+++ b/tools/start
@@ -0,0 +1,5 @@
+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
diff --git a/tools/stop b/tools/stop
new file mode 100755
index 0000000000..452f5152c7
--- /dev/null
+++ b/tools/stop
@@ -0,0 +1,5 @@
+kubecfg delete /pods/mariadb
+kubecfg delete /pods/keystone
+
+kubecfg delete /services/mariadbmaster
+kubecfg delete /services/keystonemaster-5000
From 2204cb4063508bdf7764cef600cfb031ae2db80b Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Sat, 27 Sep 2014 13:29:36 -0700
Subject: [PATCH 07/10] Add a start and stop command
Start communicates with kubecfg to start the OpenStack services.
Stop communicates with kubecfg to stpo the OpenStack services.
---
tools/start | 6 ++++++
tools/stop | 6 ++++++
2 files changed, 12 insertions(+)
create mode 100755 tools/start
create mode 100755 tools/stop
diff --git a/tools/start b/tools/start
new file mode 100755
index 0000000000..718e338475
--- /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 0000000000..0d7f994958
--- /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
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: [PATCH 08/10] Point to fedora-rdo-* for image names
---
docker/keystone/keystone.json | 2 +-
docker/mariadb/mariadb.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/keystone/keystone.json b/docker/keystone/keystone.json
index 2a72efe2bf..2f707583db 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 8972ea6619..4d04f2d177 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'
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: [PATCH 09/10] 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(-)
diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 8319c0cf7c..922511c955 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 a1425fb089..130afe11a2 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=$!
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: [PATCH 10/10] Use pki_setup to set up keystone properly
---
docker/keystone/start.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index 130afe11a2..044cf4725f 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=$!