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

doc/source/dev/dev-bay-template-example.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

doc/source/dev/dev-mesos.rst

@@ -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``
 

doc/source/dev/dev-quickstart.rst

@@ -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::

etc/magnum/magnum.conf.sample

@@ -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

magnum/conductor/template_definition.py

@@ -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.')),

magnum/templates/kubernetes/elements/README.md

@@ -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 \

magnum/templates/mesos/Dockerfile

@@ -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

magnum/templates/mesos/README.md

@@ -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.

magnum/templates/mesos/elements/README.md

@@ -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.

specs/container-networking-model.rst

@@ -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