Rename heat-kubernetes, heat-mesos, docker-swarm

Rename heat-kubernetes to kubernetes, heat-mesos to mesos,
docker-swarm to swarm in templates.  We use heat templates and
no other methods, so I think it is unnecessary to add heat before
coe. kubernetes, mesos, swarm are better than
heat-kubernetes, heat-mesos, docker-swarm.

Change-Id: I257b35c1c4ef55d3172095736f550f2c55c8d81f
Closes-Bug: #1514682
changes/32/243432/5
Hua Wang 7 years ago committed by Hongbin Lu
parent be68eb64ce
commit 37b731b510
  1. 16
      doc/source/dev/dev-bay-template-example.rst
  2. 6
      doc/source/dev/dev-mesos.rst
  3. 2
      doc/source/dev/dev-quickstart.rst
  4. 12
      etc/magnum/magnum.conf.sample
  5. 8
      magnum/conductor/template_definition.py
  6. 0
      magnum/templates/kubernetes/COPYING
  7. 0
      magnum/templates/kubernetes/README.md
  8. 2
      magnum/templates/kubernetes/elements/README.md
  9. 0
      magnum/templates/kubernetes/elements/kubernetes/elements-deps
  10. 0
      magnum/templates/kubernetes/elements/kubernetes/package-installs.yaml
  11. 0
      magnum/templates/kubernetes/fragments/add-proxy.sh
  12. 0
      magnum/templates/kubernetes/fragments/configure-docker-registry.sh
  13. 0
      magnum/templates/kubernetes/fragments/configure-docker-storage.sh
  14. 0
      magnum/templates/kubernetes/fragments/configure-etcd.sh
  15. 0
      magnum/templates/kubernetes/fragments/configure-flannel.sh
  16. 0
      magnum/templates/kubernetes/fragments/configure-kubernetes-master.sh
  17. 0
      magnum/templates/kubernetes/fragments/configure-kubernetes-minion.sh
  18. 0
      magnum/templates/kubernetes/fragments/coreos.params.yaml
  19. 0
      magnum/templates/kubernetes/fragments/disable-selinux.sh
  20. 0
      magnum/templates/kubernetes/fragments/enable-docker-registry.sh
  21. 0
      magnum/templates/kubernetes/fragments/enable-etcd.sh
  22. 0
      magnum/templates/kubernetes/fragments/enable-services-master.sh
  23. 0
      magnum/templates/kubernetes/fragments/enable-services-minion.sh
  24. 0
      magnum/templates/kubernetes/fragments/kube-examples.yaml
  25. 0
      magnum/templates/kubernetes/fragments/kube-register.yaml
  26. 0
      magnum/templates/kubernetes/fragments/kube-user.yaml
  27. 0
      magnum/templates/kubernetes/fragments/make-cert-client.sh
  28. 0
      magnum/templates/kubernetes/fragments/make-cert.sh
  29. 0
      magnum/templates/kubernetes/fragments/network-config-service.sh
  30. 0
      magnum/templates/kubernetes/fragments/network-service.sh
  31. 0
      magnum/templates/kubernetes/fragments/write-heat-params-master.yaml
  32. 0
      magnum/templates/kubernetes/fragments/write-heat-params.yaml
  33. 0
      magnum/templates/kubernetes/fragments/write-kube-os-config.sh
  34. 0
      magnum/templates/kubernetes/fragments/write-kubeconfig.yaml
  35. 0
      magnum/templates/kubernetes/fragments/write-network-config.sh
  36. 0
      magnum/templates/kubernetes/kubecluster-coreos.yaml
  37. 0
      magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml
  38. 0
      magnum/templates/kubernetes/kubecluster.yaml
  39. 0
      magnum/templates/kubernetes/kubemaster-coreos.yaml
  40. 0
      magnum/templates/kubernetes/kubemaster-fedora-ironic.yaml
  41. 0
      magnum/templates/kubernetes/kubemaster.yaml
  42. 0
      magnum/templates/kubernetes/kubeminion-coreos.yaml
  43. 0
      magnum/templates/kubernetes/kubeminion-fedora-ironic.yaml
  44. 0
      magnum/templates/kubernetes/kubeminion.yaml
  45. 0
      magnum/templates/mesos/COPYING
  46. 2
      magnum/templates/mesos/Dockerfile
  47. 2
      magnum/templates/mesos/README.md
  48. 2
      magnum/templates/mesos/elements/README.md
  49. 0
      magnum/templates/mesos/elements/docker/elements-deps
  50. 0
      magnum/templates/mesos/elements/docker/package-installs.yaml
  51. 0
      magnum/templates/mesos/elements/docker/post-install.d/60-disable-docker-service
  52. 0
      magnum/templates/mesos/elements/docker/pre-install.d/10-add-docker-repo
  53. 0
      magnum/templates/mesos/elements/mesos/elements-deps
  54. 0
      magnum/templates/mesos/elements/mesos/package-installs.yaml
  55. 0
      magnum/templates/mesos/elements/mesos/post-install.d/60-disable-upstart
  56. 0
      magnum/templates/mesos/elements/mesos/pre-install.d/10-apt-repo
  57. 0
      magnum/templates/mesos/fragments/configure-mesos-master.sh
  58. 0
      magnum/templates/mesos/fragments/configure-mesos-slave.sh
  59. 0
      magnum/templates/mesos/fragments/start-services-master.sh
  60. 0
      magnum/templates/mesos/fragments/start-services-slave.sh
  61. 0
      magnum/templates/mesos/fragments/write-heat-params-master.yaml
  62. 0
      magnum/templates/mesos/fragments/write-heat-params.yaml
  63. 0
      magnum/templates/mesos/mesoscluster.yaml
  64. 0
      magnum/templates/mesos/mesosslave.yaml
  65. 0
      magnum/templates/swarm/COPYING
  66. 0
      magnum/templates/swarm/README.md
  67. 0
      magnum/templates/swarm/fragments/add-proxy.sh
  68. 0
      magnum/templates/swarm/fragments/cfn-signal.sh
  69. 0
      magnum/templates/swarm/fragments/configure-swarm.sh
  70. 0
      magnum/templates/swarm/fragments/disable-selinux.sh
  71. 0
      magnum/templates/swarm/fragments/enable-services.sh
  72. 0
      magnum/templates/swarm/fragments/make-cert.py
  73. 0
      magnum/templates/swarm/fragments/remove-docker-key.sh
  74. 0
      magnum/templates/swarm/fragments/write-bay-failure-service.yaml
  75. 0
      magnum/templates/swarm/fragments/write-docker-service.sh
  76. 0
      magnum/templates/swarm/fragments/write-docker-socket.yaml
  77. 0
      magnum/templates/swarm/fragments/write-heat-params.yaml
  78. 0
      magnum/templates/swarm/fragments/write-swarm-agent-service.yaml
  79. 0
      magnum/templates/swarm/fragments/write-swarm-master-service.sh
  80. 0
      magnum/templates/swarm/swarm.yaml
  81. 0
      magnum/templates/swarm/swarmnode.yaml
  82. 2
      specs/container-networking-model.rst

@ -58,8 +58,8 @@ Enabling a template is as simple as adding it's Entry Point to the
(.venv)$ magnum-template-manage list-templates
Enabled Templates
magnum_vm_atomic_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/heat-kubernetes/kubecluster.yaml
magnum_vm_coreos_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/heat-kubernetes/kubecluster-coreos.yaml
magnum_vm_atomic_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/kubernetes/kubecluster.yaml
magnum_vm_coreos_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/kubernetes/kubecluster-coreos.yaml
Disabled Templates
# Install example template
@ -71,8 +71,8 @@ Enabling a template is as simple as adding it's Entry Point to the
(.venv)$ magnum-template-manage list-templates
Enabled Templates
magnum_vm_atomic_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/heat-kubernetes/kubecluster.yaml
magnum_vm_coreos_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/heat-kubernetes/kubecluster-coreos.yaml
magnum_vm_atomic_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/kubernetes/kubecluster.yaml
magnum_vm_coreos_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/kubernetes/kubecluster-coreos.yaml
Disabled Templates
example_template: /home/example/.venv/local/lib/python2.7/site-packages/ExampleTemplate-0.1-py2.7.egg/example_template/example.yaml
@ -89,8 +89,8 @@ Enabling a template is as simple as adding it's Entry Point to the
(.venv)$ magnum-template-manage list-templates
Enabled Templates
example_template: /home/example/.venv/local/lib/python2.7/site-packages/ExampleTemplate-0.1-py2.7.egg/example_template/example.yaml
magnum_vm_atomic_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/heat-kubernetes/kubecluster.yaml
magnum_vm_coreos_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/heat-kubernetes/kubecluster-coreos.yaml
magnum_vm_atomic_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/kubernetes/kubecluster.yaml
magnum_vm_coreos_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/kubernetes/kubecluster-coreos.yaml
Disabled Templates
# Use --details argument to get more details about each template
@ -100,10 +100,10 @@ Enabling a template is as simple as adding it's Entry Point to the
example_template: /home/example/.venv/local/lib/python2.7/site-packages/ExampleTemplate-0.1-py2.7.egg/example_template/example.yaml
Server_Type OS CoE
vm example example_coe
magnum_vm_atomic_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/heat-kubernetes/kubecluster.yaml
magnum_vm_atomic_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/kubernetes/kubecluster.yaml
Server_Type OS CoE
vm fedora-atomic kubernetes
magnum_vm_coreos_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/heat-kubernetes/kubecluster-coreos.yaml
magnum_vm_coreos_k8s: /home/example/.venv/local/lib/python2.7/site-packages/magnum/templates/kubernetes/kubecluster-coreos.yaml
Server_Type OS CoE
vm coreos kubernetes
Disabled Templates

@ -32,7 +32,7 @@ of two methods:
Disk Image Builder
^^^^^^^^^^^^^^^^^^
`elements <http://git.openstack.org/cgit/openstack/magnum/tree/magnum/templates/heat-mesos/elements/>`__
`elements <http://git.openstack.org/cgit/openstack/magnum/tree/magnum/templates/mesos/elements/>`__
directory contains `diskimage-builder <http://docs.openstack.org/developer/diskimage-builder>`__
elements to build an image which contains mesos and its frameworks
required to use the heat template mesoscluster.yaml.
@ -50,7 +50,7 @@ can be built and uploaded to glance as follows:
$ git clone https://git.openstack.org/openstack/diskimage-builder.git
$ git clone https://git.openstack.org/openstack/dib-utils.git
$ export PATH="${PWD}/dib-utils/bin:$PATH"
$ export ELEMENTS_PATH=magnum/magnum/templates/heat-mesos/elements
$ export ELEMENTS_PATH=magnum/magnum/templates/mesos/elements
$ export DIB_RELEASE=trusty
$ diskimage-builder/bin/disk-image-create ubuntu vm docker mesos \
@ -66,7 +66,7 @@ Docker
Install docker using ``curl -sSL http://get.docker.com | sudo bash`` or
use the appropriate system packaging.
Use the provided `Dockerfile <http://git.openstack.org/cgit/openstack/magnum/tree/magnum/templates/heat-mesos/Dockerfile>`__ to build the image (it
Use the provided `Dockerfile <http://git.openstack.org/cgit/openstack/magnum/tree/magnum/templates/mesos/Dockerfile>`__ to build the image (it
uses the same DIB scripts as above). The resultant image will be saved
as ``/tmp/ubuntu-mesos.qcow2``

@ -464,7 +464,7 @@ Building and Using a Mesos Bay
Provisioning a mesos bay requires a Ubuntu-based image with some packages
pre-installed. To build and upload such image, please refer to
`<http://docs.openstack.org/developer/magnum/dev/dev-heat-mesos.html>`_
`<http://docs.openstack.org/developer/magnum/dev/dev-mesos.html>`_
Then, create a baymodel by using 'mesos' as the coe, with the rest of arguments
similar to the Kubernetes baymodel::

@ -257,6 +257,10 @@
# starting a service (at DEBUG level). (boolean value)
#log_options = true
# Specify a timeout after which a gracefully shutdown server will
# exit. Zero value means endless wait. (integer value)
#graceful_shutdown_timeout = 0
[api]
@ -301,11 +305,11 @@
# Location of template to build a k8s cluster on atomic. (string
# value)
# Deprecated group/name - [bay_heat]/template_path
#k8s_atomic_template_path = $pybasedir/templates/heat-kubernetes/kubecluster.yaml
#k8s_atomic_template_path = $pybasedir/templates/kubernetes/kubecluster.yaml
# Location of template to build a k8s cluster on CoreOS. (string
# value)
#k8s_coreos_template_path = $pybasedir/templates/heat-kubernetes/kubecluster-coreos.yaml
#k8s_coreos_template_path = $pybasedir/templates/kubernetes/kubecluster-coreos.yaml
# Url for etcd public discovery endpoint. (string value)
#etcd_discovery_service_endpoint_format = https://discovery.etcd.io/new?size=%(size)d
@ -316,7 +320,7 @@
# Location of template to build a swarm cluster on atomic. (string
# value)
#swarm_atomic_template_path = $pybasedir/templates/docker-swarm/swarm.yaml
#swarm_atomic_template_path = $pybasedir/templates/swarm/swarm.yaml
# Format string to use for swarm discovery url. Available values:
# bay_id, bay_uuid. Example: "etcd://etcd.example.com/\%(bay_uuid)s"
@ -332,7 +336,7 @@
# Location of template to build a Mesos cluster on Ubuntu. (string
# value)
#mesos_ubuntu_template_path = $pybasedir/templates/heat-mesos/mesoscluster.yaml
#mesos_ubuntu_template_path = $pybasedir/templates/mesos/mesoscluster.yaml
# Enabled bay definition entry points. (list value)
#enabled_definitions = magnum_vm_atomic_k8s,magnum_vm_coreos_k8s,magnum_vm_atomic_swarm,magnum_vm_ubuntu_mesos

@ -35,14 +35,14 @@ DOCKER_PORT = '2376'
template_def_opts = [
cfg.StrOpt('k8s_atomic_template_path',
default=paths.basedir_def('templates/heat-kubernetes/'
default=paths.basedir_def('templates/kubernetes/'
'kubecluster.yaml'),
deprecated_name='template_path',
deprecated_group='bay_heat',
help=_(
'Location of template to build a k8s cluster on atomic.')),
cfg.StrOpt('k8s_coreos_template_path',
default=paths.basedir_def('templates/heat-kubernetes/'
default=paths.basedir_def('templates/kubernetes/'
'kubecluster-coreos.yaml'),
help=_(
'Location of template to build a k8s cluster on CoreOS.')),
@ -54,7 +54,7 @@ template_def_opts = [
deprecated_group='bay_heat',
help=_('coreos discovery token url.')),
cfg.StrOpt('swarm_atomic_template_path',
default=paths.basedir_def('templates/docker-swarm/'
default=paths.basedir_def('templates/swarm/'
'swarm.yaml'),
help=_('Location of template to build a swarm '
'cluster on atomic.')),
@ -70,7 +70,7 @@ template_def_opts = [
default='https://discovery.hub.docker.com/v1/clusters',
help=_('Url for swarm public discovery endpoint.')),
cfg.StrOpt('mesos_ubuntu_template_path',
default=paths.basedir_def('templates/heat-mesos/'
default=paths.basedir_def('templates/mesos/'
'mesoscluster.yaml'),
help=_('Location of template to build a Mesos cluster '
'on Ubuntu.')),

@ -13,7 +13,7 @@ An example fedora based image and uploaded to glance with the following:
git clone https://git.openstack.org/openstack/dib-utils.git
export PATH="${PWD}/dib-utils/bin:$PATH"
export ELEMENTS_PATH=tripleo-image-elements/elements:heat-templates/hot/software-config/elements
export ELEMENTS_PATH=${ELEMENTS_PATH}:magnum/etc/magnum/templates/heat-kubernetes/elements
export ELEMENTS_PATH=${ELEMENTS_PATH}:magnum/etc/magnum/templates/kubernetes/elements
export DIB_RELEASE=21
diskimage-builder/bin/disk-image-create baremetal \
fedora selinux-permissive \

@ -8,7 +8,7 @@ RUN \
WORKDIR /build
ENV PATH="/build/dib-utils/bin:$PATH" ELEMENTS_PATH="magnum/magnum/templates/heat-mesos/elements" DIB_RELEASE=trusty
ENV PATH="/build/dib-utils/bin:$PATH" ELEMENTS_PATH="magnum/magnum/templates/mesos/elements" DIB_RELEASE=trusty
RUN git clone https://git.openstack.org/openstack/magnum
RUN git clone https://git.openstack.org/openstack/diskimage-builder.git

@ -1,4 +1,4 @@
A Mesos cluster with Heat
=========================
See [Mesos cluster with Heat](http://docs.openstack.org/developer/magnum/dev/dev-heat-mesos.html) for instructions.
See [Mesos cluster with Heat](http://docs.openstack.org/developer/magnum/dev/dev-mesos.html) for instructions.

@ -1,4 +1,4 @@
Mesos elements
==============
See [Building an image](http://docs.openstack.org/developer/magnum/dev/dev-heat-mesos.html) for instructions.
See [Building an image](http://docs.openstack.org/developer/magnum/dev/dev-mesos.html) for instructions.

@ -448,6 +448,6 @@ References
[5] https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/design/networking.md
[6] https://github.com/coreos/flannel
[7] https://github.com/coreos/rkt/blob/master/Documentation/networking.md
[8] https://github.com/openstack/magnum/blob/master/magnum/templates/heat-kubernetes/kubecluster.yaml
[8] https://github.com/openstack/magnum/blob/master/magnum/templates/kubernetes/kubecluster.yaml
[9] https://blueprints.launchpad.net/magnum/+spec/expand-labels-scope
[10] https://github.com/openstack/kuryr

Loading…
Cancel
Save