diff --git a/README.md b/README.md index d7ef135fa257ecb3d5f7246bf5031d3db8af068e..93f37c3b206a1aa80586c71bc287895bd859d4a6 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 718e338475a9319686ff79d1ad5667ff7b76b1b5..e61166fd4b14970d303c9c198827f234796b4b7e 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