diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-19 14:48:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-19 14:48:24 +0000 |
| commit | f0cabe689039773758a0a15262fa45b119a7b9a4 (patch) | |
| tree | f8b5094c5c948e5e078a7bed696bf287ebaf8db2 | |
| parent | 874b1386ab9242917d5363bfe6e57e8cb06c3310 (diff) | |
| parent | 27d98f9e4cb812c172871527a14cc8f00c325fdb (diff) | |
| download | kolla-f0cabe689039773758a0a15262fa45b119a7b9a4.tar.gz kolla-f0cabe689039773758a0a15262fa45b119a7b9a4.zip | |
Merge "Remove kolla-k8s from kolla"
| -rw-r--r-- | README.rst | 10 | ||||
| -rw-r--r-- | deliverables.yaml | 2 | ||||
| -rw-r--r-- | doc/source/index.rst | 1 |
3 files changed, 3 insertions, 10 deletions
diff --git a/README.rst b/README.rst index 17787fff5..acc08874d 100644 --- a/README.rst +++ b/README.rst @@ -23,8 +23,7 @@ Kolla's mission statement is: Kolla provides `Docker <https://docker.com/>`__ containers, `Ansible <https://ansible.com/>`__ playbooks to deploy OpenStack on baremetal -or virtual machine, and Kubernetes templates to deploy OpenStack on Kubernetes -to meet Kolla's mission. +or virtual machine to meet Kolla's mission. Kolla has out of the box defaults for a working basic deployment, and also implements complete customization. This model permits operators with minimal @@ -38,15 +37,13 @@ Learn about Kolla by reading the documentation online `Kolla <https://docs.openstack.org/kolla/latest/>`__. Get started by reading the `Kolla Ansible Developer -Quickstart <https://docs.openstack.org/kolla-ansible/latest/user/quickstart.html>`__ -or the `Kolla Kubernetes Developer -Quickstart <https://docs.openstack.org/kolla-kubernetes/latest/deployment-guide.html>`__. +Quickstart <https://docs.openstack.org/kolla-ansible/latest/user/quickstart.html>`__. The Kolla Repository ==================== The Kolla repository is one of three deliverables of the OpenStack Kolla -project. The three deliverables that make up the Kolla project are: +project. The three deliverables that make up the Kolla project are: ================ ========================================================= Deliverable Repository @@ -54,7 +51,6 @@ Deliverable Repository kolla https://git.openstack.org/cgit/openstack/kolla kolla-ansible https://git.openstack.org/cgit/openstack/kolla-ansible kolla-cli https://git.openstack.org/cgit/openstack/kolla-cli -kolla-kubernetes https://git.openstack.org/cgit/openstack/kolla-kubernetes ================ ========================================================= The `Docker images <https://docs.docker.com/engine/userguide/storagedriver/ diff --git a/deliverables.yaml b/deliverables.yaml index 77633e50f..c57dba21b 100644 --- a/deliverables.yaml +++ b/deliverables.yaml @@ -10,5 +10,3 @@ repository: https://git.openstack.org/cgit/openstack/kolla-ansible - name: kolla-cli repository: https://git.openstack.org/cgit/openstack/kolla-cli -- name: kolla-kubernetes - repository: https://git.openstack.org/cgit/openstack/kolla-kubernetes diff --git a/doc/source/index.rst b/doc/source/index.rst index 54f07dc48..8556819a0 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -25,7 +25,6 @@ This documentation is for the Kolla container images. The following subprojects are available to help deploy Kolla: * `kolla-ansible <https://docs.openstack.org/kolla-ansible/latest/>`_ -* `kolla-kubernetes <https://docs.openstack.org/kolla-kubernetes/latest/>`_ Site Notes ========== |