openstack/magnum
Code Issues Proposed changes

Merge "Fix doc format"

Browse Source
This commit is contained in:
Zuul 2018-08-16 12:37:33 +00:00 committed by Gerrit Code Review
commit 8a229ffc72
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/source/admin/magnum-proxy.rst
View File

@ -40,7 +40,9 @@ Steps to configure proxies.
You can specify all three proxy parameters while creating ClusterTemplate of
any coe type. All of proxy parameters are optional.
openstack coe cluster template create k8s-cluster-template \
.. code-block:: console
$ openstack coe cluster template create k8s-cluster-template \
--image fedora-atomic-latest \
--keypair testkey \
--external-network public \
@ -50,7 +52,10 @@ any coe type. All of proxy parameters are optional.
--http-proxy <http://abc-proxy.com:8080> \
--https-proxy <https://abc-proxy.com:8080> \
--no-proxy <172.24.4.4,172.24.4.9,172.24.4.8>
openstack coe cluster template create swarm-cluster-template \
.. code-block:: console
$ openstack coe cluster template create swarm-cluster-template \
--image fedora-atomic-latest \
--keypair testkey \
--external-network public \
@ -60,7 +65,10 @@ any coe type. All of proxy parameters are optional.
--http-proxy <http://abc-proxy.com:8080> \
--https-proxy <https://abc-proxy.com:8080> \
--no-proxy <172.24.4.4,172.24.4.9,172.24.4.8>
openstack coe cluster template create mesos-cluster-template \
.. code-block:: console
$ openstack coe cluster template create mesos-cluster-template \
--image ubuntu-mesos \
--keypair testkey \
--external-network public \

4
doc/source/contributor/api-microversion.rst
View File

@ -165,8 +165,8 @@ we need a microversion".
url/resource that does not exist always fails with 404. Invalid content types
are handled before API methods are called which results in a 415.
.. note:: When in doubt about whether or not a microversion is required
for changing an error response code, consult the `Containers Team`_.
.. note:: When in doubt about whether or not a microversion is required
for changing an error response code, consult the `Containers Team`_.
.. _Containers Team: https://wiki.openstack.org/wiki/Meetings/Containers

1
doc/source/user/index.rst
View File

@ -1426,7 +1426,6 @@ Storage driver (docker-storage-driver)
This is currently not supported for Mesos.
Image (image)
Specified in the ClusterTemplate to indicate the image to boot the servers
for the Mesos master and slave. The image binary is loaded in
Glance with the attribute 'os_distro = ubuntu'. You can download