openstack
/
kolla
Code Issues Proposed changes

Merge "Remove kolla-k8s from kolla"

This commit is contained in:
Zuul 2018-06-19 14:48:24 +00:00 committed by Gerrit Code Review
parent 874b1386ab 27d98f9e4c
commit f0cabe6890
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.rst
View File

@ -23,8 +23,7 @@ Kolla's mission statement is:
Kolla provides `Docker <https://docker.com/>`__ containers, Kolla provides `Docker <https://docker.com/>`__ containers,
`Ansible <https://ansible.com/>`__ playbooks to deploy OpenStack on baremetal `Ansible <https://ansible.com/>`__ playbooks to deploy OpenStack on baremetal
or virtual machine, and Kubernetes templates to deploy OpenStack on Kubernetes or virtual machine to meet Kolla's mission.
to meet Kolla's mission.
Kolla has out of the box defaults for a working basic deployment, and also Kolla has out of the box defaults for a working basic deployment, and also
implements complete customization. This model permits operators with minimal 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/>`__. `Kolla <https://docs.openstack.org/kolla/latest/>`__.
Get started by reading the `Kolla Ansible Developer Get started by reading the `Kolla Ansible Developer
Quickstart <https://docs.openstack.org/kolla-ansible/latest/user/quickstart.html>`__ 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>`__.
The Kolla Repository The Kolla Repository
==================== ====================
The Kolla repository is one of three deliverables of the OpenStack Kolla 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 Deliverable Repository
@ -54,7 +51,6 @@ Deliverable Repository
kolla https://git.openstack.org/cgit/openstack/kolla kolla https://git.openstack.org/cgit/openstack/kolla
kolla-ansible https://git.openstack.org/cgit/openstack/kolla-ansible kolla-ansible https://git.openstack.org/cgit/openstack/kolla-ansible
kolla-cli https://git.openstack.org/cgit/openstack/kolla-cli 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/ The `Docker images <https://docs.docker.com/engine/userguide/storagedriver/

2
deliverables.yaml
View File

@ -10,5 +10,3 @@
repository: https://git.openstack.org/cgit/openstack/kolla-ansible repository: https://git.openstack.org/cgit/openstack/kolla-ansible
- name: kolla-cli - name: kolla-cli
repository: https://git.openstack.org/cgit/openstack/kolla-cli repository: https://git.openstack.org/cgit/openstack/kolla-cli
- name: kolla-kubernetes
repository: https://git.openstack.org/cgit/openstack/kolla-kubernetes

1
doc/source/index.rst
View File

@ -25,7 +25,6 @@ This documentation is for the Kolla container images. The following subprojects
are available to help deploy Kolla: are available to help deploy Kolla:
* `kolla-ansible <https://docs.openstack.org/kolla-ansible/latest/>`_ * `kolla-ansible <https://docs.openstack.org/kolla-ansible/latest/>`_
* `kolla-kubernetes <https://docs.openstack.org/kolla-kubernetes/latest/>`_
Site Notes Site Notes
========== ==========