From 2bc783b8c62c254357b1af6d2f27dde6efd497b5 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Tue, 7 Oct 2014 15:32:34 -0700
Subject: [PATCH] Reorganize k8s structure
All services go to TLD/k8s/service
All pods go to TLD/k8s/pod
Change-Id: Iad2977a9f0cd5f430c4e0a566846bf4681618379
---
README.md | 19 ++++++++++---------
.../glance.json => k8s/pod/glance-pod.json | 0
.../heat/heat.json => k8s/pod/heat-pod.json | 0
.../pod/keystone-pod.json | 0
.../mariadb.json => k8s/pod/mariadb-pod.json | 0
.../pod/nova-compute-pod.json | 0
.../pod/nova-controller-pod.json | 0
.../pod/rabbitmq-pod.json | 0
.../swift.json => k8s/pod/swift-pod.json | 0
.../service}/glance-api-service.json | 0
.../service}/glance-registry-service.json | 0
.../service}/keystone-admin-service.json | 0
.../service}/keystone-public-service.json | 0
.../service}/mariadb-service.json | 0
.../service}/nova-compute-service.json | 0
.../service}/nova-libvirt-service.json | 0
.../service}/rabbitmq-service.json | 0
tools/start | 11 ++++++-----
18 files changed, 16 insertions(+), 14 deletions(-)
rename docker/glance/glance.json => k8s/pod/glance-pod.json (100%)
rename docker/heat/heat.json => k8s/pod/heat-pod.json (100%)
rename docker/keystone/keystone.json => k8s/pod/keystone-pod.json (100%)
rename docker/mariadb/mariadb.json => k8s/pod/mariadb-pod.json (100%)
rename docker/nova-compute/nova-compute.json => k8s/pod/nova-compute-pod.json (100%)
rename docker/nova-controller/nova-controller.json => k8s/pod/nova-controller-pod.json (100%)
rename docker/rabbitmq/rabbitmq.json => k8s/pod/rabbitmq-pod.json (100%)
rename docker/swift/swift.json => k8s/pod/swift-pod.json (100%)
rename {docker/glance => k8s/service}/glance-api-service.json (100%)
rename {docker/glance => k8s/service}/glance-registry-service.json (100%)
rename {docker/keystone => k8s/service}/keystone-admin-service.json (100%)
rename {docker/keystone => k8s/service}/keystone-public-service.json (100%)
rename {docker/mariadb => k8s/service}/mariadb-service.json (100%)
rename {docker/nova-compute => k8s/service}/nova-compute-service.json (100%)
rename {docker/nova-compute => k8s/service}/nova-libvirt-service.json (100%)
rename {docker/rabbitmq => k8s/service}/rabbitmq-service.json (100%)
diff --git a/README.md b/README.md
index d7ef135fa2..93f37c3b20 100644
--- a/README.md
+++ b/README.md
@@ -54,8 +54,8 @@ just enough to verify that services are running and may have bugs in their confi
To get Keystone running start by downloading the pod and service json files for MariaDB
to a running kubernetes cluster.
```
-curl https://raw.githubusercontent.com/stackforge/kolla/master/docker/mariadb/mariadb-service.json > mariadb-service.json
-curl https://raw.githubusercontent.com/stackforge/kolla/master/docker/mariadb/mariadb.json > mariadb.json
+curl https://raw.githubusercontent.com/stackforge/kolla/master/k8s/service/mariadb-service.json > mariadb-service.json
+curl https://raw.githubusercontent.com/stackforge/kolla/master/k8s/pod/mariadb-pod.json > mariadb-pod.json
```
Next launch the MariaDB pod and service files. The services are started first incase the pods reference
@@ -66,7 +66,7 @@ ID Labels Selector Port
---------- ---------- ---------- ----------
mariadb name=mariadb 3306
-$ kubecfg -c mariadb.json create pods
+$ kubecfg -c mariadb-pod.json create pods
ID Image(s) Host Labels Status
---------- ---------- ---------- ---------- ----------
mariadb kollaglue/fedora-rdo-mariadb / name=mariadb Waiting
@@ -115,12 +115,12 @@ try restarting openvswitch on both nodes. This has usually fixed the connection
If you're able to connect to mysql though both proxies then you're ready to launch keystone. Download and
use the pod and service files to launch the pods and services for keystone.
```
-$ curl https://raw.githubusercontent.com/stackforge/kolla/master/docker/keystone/keystone-service-35357.json > keystone-service-35357.json
-$ curl https://raw.githubusercontent.com/stackforge/kolla/master/docker/keystone/keystone-service-5000.json > keystone-service-5000.json
-$ curl https://raw.githubusercontent.com/stackforge/kolla/master/docker/keystone/keystone.json > keystone.json
-$ kubecfg -c keystone-service-5000.json create services
-$ kubecfg -c keystone-service-35357.json create services
-$ kubecfg -c keystone.json create pods
+$ curl https://raw.githubusercontent.com/stackforge/kolla/master/k8s/keystone/keystone-admin-service.json > keystone-admin-service.json
+$ curl https://raw.githubusercontent.com/stackforge/kolla/master/k8s/keystone/keystone-public-service.json > keystone-public-service.json
+$ curl https://raw.githubusercontent.com/stackforge/kolla/master/k8s/pod/keystone-pod.json > keystone-pod.json
+$ kubecfg -c keystone-keystone-public.json create services
+$ kubecfg -c keystone-keystone-admin.json create services
+$ kubecfg -c keystone-pod.json create pods
```
The keystone pod should become status running, if it doesn't you can troubleshoot it the same way that the
database was. Once keystone is running you should be able to use the keystone client to do a token-get
@@ -130,3 +130,4 @@ Directories
===========
* docker - contains artifacts for use with docker build to build appropriate images
+* k8s - contains service and pod configuration information for Kubernetes
diff --git a/docker/glance/glance.json b/k8s/pod/glance-pod.json
similarity index 100%
rename from docker/glance/glance.json
rename to k8s/pod/glance-pod.json
diff --git a/docker/heat/heat.json b/k8s/pod/heat-pod.json
similarity index 100%
rename from docker/heat/heat.json
rename to k8s/pod/heat-pod.json
diff --git a/docker/keystone/keystone.json b/k8s/pod/keystone-pod.json
similarity index 100%
rename from docker/keystone/keystone.json
rename to k8s/pod/keystone-pod.json
diff --git a/docker/mariadb/mariadb.json b/k8s/pod/mariadb-pod.json
similarity index 100%
rename from docker/mariadb/mariadb.json
rename to k8s/pod/mariadb-pod.json
diff --git a/docker/nova-compute/nova-compute.json b/k8s/pod/nova-compute-pod.json
similarity index 100%
rename from docker/nova-compute/nova-compute.json
rename to k8s/pod/nova-compute-pod.json
diff --git a/docker/nova-controller/nova-controller.json b/k8s/pod/nova-controller-pod.json
similarity index 100%
rename from docker/nova-controller/nova-controller.json
rename to k8s/pod/nova-controller-pod.json
diff --git a/docker/rabbitmq/rabbitmq.json b/k8s/pod/rabbitmq-pod.json
similarity index 100%
rename from docker/rabbitmq/rabbitmq.json
rename to k8s/pod/rabbitmq-pod.json
diff --git a/docker/swift/swift.json b/k8s/pod/swift-pod.json
similarity index 100%
rename from docker/swift/swift.json
rename to k8s/pod/swift-pod.json
diff --git a/docker/glance/glance-api-service.json b/k8s/service/glance-api-service.json
similarity index 100%
rename from docker/glance/glance-api-service.json
rename to k8s/service/glance-api-service.json
diff --git a/docker/glance/glance-registry-service.json b/k8s/service/glance-registry-service.json
similarity index 100%
rename from docker/glance/glance-registry-service.json
rename to k8s/service/glance-registry-service.json
diff --git a/docker/keystone/keystone-admin-service.json b/k8s/service/keystone-admin-service.json
similarity index 100%
rename from docker/keystone/keystone-admin-service.json
rename to k8s/service/keystone-admin-service.json
diff --git a/docker/keystone/keystone-public-service.json b/k8s/service/keystone-public-service.json
similarity index 100%
rename from docker/keystone/keystone-public-service.json
rename to k8s/service/keystone-public-service.json
diff --git a/docker/mariadb/mariadb-service.json b/k8s/service/mariadb-service.json
similarity index 100%
rename from docker/mariadb/mariadb-service.json
rename to k8s/service/mariadb-service.json
diff --git a/docker/nova-compute/nova-compute-service.json b/k8s/service/nova-compute-service.json
similarity index 100%
rename from docker/nova-compute/nova-compute-service.json
rename to k8s/service/nova-compute-service.json
diff --git a/docker/nova-compute/nova-libvirt-service.json b/k8s/service/nova-libvirt-service.json
similarity index 100%
rename from docker/nova-compute/nova-libvirt-service.json
rename to k8s/service/nova-libvirt-service.json
diff --git a/docker/rabbitmq/rabbitmq-service.json b/k8s/service/rabbitmq-service.json
similarity index 100%
rename from docker/rabbitmq/rabbitmq-service.json
rename to k8s/service/rabbitmq-service.json
diff --git a/tools/start b/tools/start
index 718e338475..e61166fd4b 100755
--- a/tools/start
+++ b/tools/start
@@ -1,6 +1,7 @@
-kubecfg -c ../docker/mariadb/mariadb.json create pods
-kubecfg -c ../docker/keystone/keystone.json create pods
+kubecfg -c ../k8s/mariadb/mariadb-service.json create services
+kubecfg -c ../k8s/keystone/keystone-public-service.json create services
+kubecfg -c ../k8s/keystone/keystone-admin-service.json create services
+
+kubecfg -c ../k8s/pod/mariadb/mariadb-pod.json create pods
+kubecfg -c ../k8s/pod/keystone/keystone-pod.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
--
GitLab