diff --git a/doc/source/dev/dev-bay-template-example.rst b/doc/source/dev/dev-bay-template-example.rst index da30af85bc..3e42e36082 100644 --- a/doc/source/dev/dev-bay-template-example.rst +++ b/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 diff --git a/doc/source/dev/dev-heat-mesos.rst b/doc/source/dev/dev-mesos.rst similarity index 96% rename from doc/source/dev/dev-heat-mesos.rst rename to doc/source/dev/dev-mesos.rst index 0b273fa79a..ef28a8630c 100644 --- a/doc/source/dev/dev-heat-mesos.rst +++ b/doc/source/dev/dev-mesos.rst @@ -32,7 +32,7 @@ of two methods: Disk Image Builder ^^^^^^^^^^^^^^^^^^ -`elements `__ +`elements `__ directory contains `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 `__ to build the image (it +Use the provided `Dockerfile `__ to build the image (it uses the same DIB scripts as above). The resultant image will be saved as ``/tmp/ubuntu-mesos.qcow2`` diff --git a/doc/source/dev/dev-quickstart.rst b/doc/source/dev/dev-quickstart.rst index cf60413a80..06a6050241 100644 --- a/doc/source/dev/dev-quickstart.rst +++ b/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 -``_ +``_ Then, create a baymodel by using 'mesos' as the coe, with the rest of arguments similar to the Kubernetes baymodel:: diff --git a/etc/magnum/magnum.conf.sample b/etc/magnum/magnum.conf.sample index 44bd166ec7..321d565b2c 100644 --- a/etc/magnum/magnum.conf.sample +++ b/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 diff --git a/magnum/conductor/template_definition.py b/magnum/conductor/template_definition.py index 5fd4e8af6d..b05a288171 100644 --- a/magnum/conductor/template_definition.py +++ b/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.')), diff --git a/magnum/templates/docker-swarm/COPYING b/magnum/templates/kubernetes/COPYING similarity index 100% rename from magnum/templates/docker-swarm/COPYING rename to magnum/templates/kubernetes/COPYING diff --git a/magnum/templates/heat-kubernetes/README.md b/magnum/templates/kubernetes/README.md similarity index 100% rename from magnum/templates/heat-kubernetes/README.md rename to magnum/templates/kubernetes/README.md diff --git a/magnum/templates/heat-kubernetes/elements/README.md b/magnum/templates/kubernetes/elements/README.md similarity index 98% rename from magnum/templates/heat-kubernetes/elements/README.md rename to magnum/templates/kubernetes/elements/README.md index e9f01d5d58..f996087c98 100644 --- a/magnum/templates/heat-kubernetes/elements/README.md +++ b/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 \ diff --git a/magnum/templates/heat-kubernetes/elements/kubernetes/elements-deps b/magnum/templates/kubernetes/elements/kubernetes/elements-deps similarity index 100% rename from magnum/templates/heat-kubernetes/elements/kubernetes/elements-deps rename to magnum/templates/kubernetes/elements/kubernetes/elements-deps diff --git a/magnum/templates/heat-kubernetes/elements/kubernetes/package-installs.yaml b/magnum/templates/kubernetes/elements/kubernetes/package-installs.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/elements/kubernetes/package-installs.yaml rename to magnum/templates/kubernetes/elements/kubernetes/package-installs.yaml diff --git a/magnum/templates/heat-kubernetes/fragments/add-proxy.sh b/magnum/templates/kubernetes/fragments/add-proxy.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/add-proxy.sh rename to magnum/templates/kubernetes/fragments/add-proxy.sh diff --git a/magnum/templates/heat-kubernetes/fragments/configure-docker-registry.sh b/magnum/templates/kubernetes/fragments/configure-docker-registry.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/configure-docker-registry.sh rename to magnum/templates/kubernetes/fragments/configure-docker-registry.sh diff --git a/magnum/templates/heat-kubernetes/fragments/configure-docker-storage.sh b/magnum/templates/kubernetes/fragments/configure-docker-storage.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/configure-docker-storage.sh rename to magnum/templates/kubernetes/fragments/configure-docker-storage.sh diff --git a/magnum/templates/heat-kubernetes/fragments/configure-etcd.sh b/magnum/templates/kubernetes/fragments/configure-etcd.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/configure-etcd.sh rename to magnum/templates/kubernetes/fragments/configure-etcd.sh diff --git a/magnum/templates/heat-kubernetes/fragments/configure-flannel.sh b/magnum/templates/kubernetes/fragments/configure-flannel.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/configure-flannel.sh rename to magnum/templates/kubernetes/fragments/configure-flannel.sh diff --git a/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-master.sh b/magnum/templates/kubernetes/fragments/configure-kubernetes-master.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/configure-kubernetes-master.sh rename to magnum/templates/kubernetes/fragments/configure-kubernetes-master.sh diff --git a/magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/templates/kubernetes/fragments/configure-kubernetes-minion.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh rename to magnum/templates/kubernetes/fragments/configure-kubernetes-minion.sh diff --git a/magnum/templates/heat-kubernetes/fragments/coreos.params.yaml b/magnum/templates/kubernetes/fragments/coreos.params.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/coreos.params.yaml rename to magnum/templates/kubernetes/fragments/coreos.params.yaml diff --git a/magnum/templates/docker-swarm/fragments/disable-selinux.sh b/magnum/templates/kubernetes/fragments/disable-selinux.sh similarity index 100% rename from magnum/templates/docker-swarm/fragments/disable-selinux.sh rename to magnum/templates/kubernetes/fragments/disable-selinux.sh diff --git a/magnum/templates/heat-kubernetes/fragments/enable-docker-registry.sh b/magnum/templates/kubernetes/fragments/enable-docker-registry.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/enable-docker-registry.sh rename to magnum/templates/kubernetes/fragments/enable-docker-registry.sh diff --git a/magnum/templates/heat-kubernetes/fragments/enable-etcd.sh b/magnum/templates/kubernetes/fragments/enable-etcd.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/enable-etcd.sh rename to magnum/templates/kubernetes/fragments/enable-etcd.sh diff --git a/magnum/templates/heat-kubernetes/fragments/enable-services-master.sh b/magnum/templates/kubernetes/fragments/enable-services-master.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/enable-services-master.sh rename to magnum/templates/kubernetes/fragments/enable-services-master.sh diff --git a/magnum/templates/heat-kubernetes/fragments/enable-services-minion.sh b/magnum/templates/kubernetes/fragments/enable-services-minion.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/enable-services-minion.sh rename to magnum/templates/kubernetes/fragments/enable-services-minion.sh diff --git a/magnum/templates/heat-kubernetes/fragments/kube-examples.yaml b/magnum/templates/kubernetes/fragments/kube-examples.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/kube-examples.yaml rename to magnum/templates/kubernetes/fragments/kube-examples.yaml diff --git a/magnum/templates/heat-kubernetes/fragments/kube-register.yaml b/magnum/templates/kubernetes/fragments/kube-register.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/kube-register.yaml rename to magnum/templates/kubernetes/fragments/kube-register.yaml diff --git a/magnum/templates/heat-kubernetes/fragments/kube-user.yaml b/magnum/templates/kubernetes/fragments/kube-user.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/kube-user.yaml rename to magnum/templates/kubernetes/fragments/kube-user.yaml diff --git a/magnum/templates/heat-kubernetes/fragments/make-cert-client.sh b/magnum/templates/kubernetes/fragments/make-cert-client.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/make-cert-client.sh rename to magnum/templates/kubernetes/fragments/make-cert-client.sh diff --git a/magnum/templates/heat-kubernetes/fragments/make-cert.sh b/magnum/templates/kubernetes/fragments/make-cert.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/make-cert.sh rename to magnum/templates/kubernetes/fragments/make-cert.sh diff --git a/magnum/templates/heat-kubernetes/fragments/network-config-service.sh b/magnum/templates/kubernetes/fragments/network-config-service.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/network-config-service.sh rename to magnum/templates/kubernetes/fragments/network-config-service.sh diff --git a/magnum/templates/heat-kubernetes/fragments/network-service.sh b/magnum/templates/kubernetes/fragments/network-service.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/network-service.sh rename to magnum/templates/kubernetes/fragments/network-service.sh diff --git a/magnum/templates/heat-kubernetes/fragments/write-heat-params-master.yaml b/magnum/templates/kubernetes/fragments/write-heat-params-master.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/write-heat-params-master.yaml rename to magnum/templates/kubernetes/fragments/write-heat-params-master.yaml diff --git a/magnum/templates/heat-kubernetes/fragments/write-heat-params.yaml b/magnum/templates/kubernetes/fragments/write-heat-params.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/write-heat-params.yaml rename to magnum/templates/kubernetes/fragments/write-heat-params.yaml diff --git a/magnum/templates/heat-kubernetes/fragments/write-kube-os-config.sh b/magnum/templates/kubernetes/fragments/write-kube-os-config.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/write-kube-os-config.sh rename to magnum/templates/kubernetes/fragments/write-kube-os-config.sh diff --git a/magnum/templates/heat-kubernetes/fragments/write-kubeconfig.yaml b/magnum/templates/kubernetes/fragments/write-kubeconfig.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/write-kubeconfig.yaml rename to magnum/templates/kubernetes/fragments/write-kubeconfig.yaml diff --git a/magnum/templates/heat-kubernetes/fragments/write-network-config.sh b/magnum/templates/kubernetes/fragments/write-network-config.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/write-network-config.sh rename to magnum/templates/kubernetes/fragments/write-network-config.sh diff --git a/magnum/templates/heat-kubernetes/kubecluster-coreos.yaml b/magnum/templates/kubernetes/kubecluster-coreos.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/kubecluster-coreos.yaml rename to magnum/templates/kubernetes/kubecluster-coreos.yaml diff --git a/magnum/templates/heat-kubernetes/kubecluster-fedora-ironic.yaml b/magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/kubecluster-fedora-ironic.yaml rename to magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml diff --git a/magnum/templates/heat-kubernetes/kubecluster.yaml b/magnum/templates/kubernetes/kubecluster.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/kubecluster.yaml rename to magnum/templates/kubernetes/kubecluster.yaml diff --git a/magnum/templates/heat-kubernetes/kubemaster-coreos.yaml b/magnum/templates/kubernetes/kubemaster-coreos.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/kubemaster-coreos.yaml rename to magnum/templates/kubernetes/kubemaster-coreos.yaml diff --git a/magnum/templates/heat-kubernetes/kubemaster-fedora-ironic.yaml b/magnum/templates/kubernetes/kubemaster-fedora-ironic.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/kubemaster-fedora-ironic.yaml rename to magnum/templates/kubernetes/kubemaster-fedora-ironic.yaml diff --git a/magnum/templates/heat-kubernetes/kubemaster.yaml b/magnum/templates/kubernetes/kubemaster.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/kubemaster.yaml rename to magnum/templates/kubernetes/kubemaster.yaml diff --git a/magnum/templates/heat-kubernetes/kubeminion-coreos.yaml b/magnum/templates/kubernetes/kubeminion-coreos.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/kubeminion-coreos.yaml rename to magnum/templates/kubernetes/kubeminion-coreos.yaml diff --git a/magnum/templates/heat-kubernetes/kubeminion-fedora-ironic.yaml b/magnum/templates/kubernetes/kubeminion-fedora-ironic.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/kubeminion-fedora-ironic.yaml rename to magnum/templates/kubernetes/kubeminion-fedora-ironic.yaml diff --git a/magnum/templates/heat-kubernetes/kubeminion.yaml b/magnum/templates/kubernetes/kubeminion.yaml similarity index 100% rename from magnum/templates/heat-kubernetes/kubeminion.yaml rename to magnum/templates/kubernetes/kubeminion.yaml diff --git a/magnum/templates/heat-kubernetes/COPYING b/magnum/templates/mesos/COPYING similarity index 100% rename from magnum/templates/heat-kubernetes/COPYING rename to magnum/templates/mesos/COPYING diff --git a/magnum/templates/heat-mesos/Dockerfile b/magnum/templates/mesos/Dockerfile similarity index 91% rename from magnum/templates/heat-mesos/Dockerfile rename to magnum/templates/mesos/Dockerfile index f1d6f56296..55b5e06e2d 100644 --- a/magnum/templates/heat-mesos/Dockerfile +++ b/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 diff --git a/magnum/templates/heat-mesos/README.md b/magnum/templates/mesos/README.md similarity index 69% rename from magnum/templates/heat-mesos/README.md rename to magnum/templates/mesos/README.md index e30a03e079..b5996bc4d5 100644 --- a/magnum/templates/heat-mesos/README.md +++ b/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. diff --git a/magnum/templates/heat-mesos/elements/README.md b/magnum/templates/mesos/elements/README.md similarity index 67% rename from magnum/templates/heat-mesos/elements/README.md rename to magnum/templates/mesos/elements/README.md index d03ca96124..9cf6d58ea6 100644 --- a/magnum/templates/heat-mesos/elements/README.md +++ b/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. diff --git a/magnum/templates/heat-mesos/elements/docker/elements-deps b/magnum/templates/mesos/elements/docker/elements-deps similarity index 100% rename from magnum/templates/heat-mesos/elements/docker/elements-deps rename to magnum/templates/mesos/elements/docker/elements-deps diff --git a/magnum/templates/heat-mesos/elements/docker/package-installs.yaml b/magnum/templates/mesos/elements/docker/package-installs.yaml similarity index 100% rename from magnum/templates/heat-mesos/elements/docker/package-installs.yaml rename to magnum/templates/mesos/elements/docker/package-installs.yaml diff --git a/magnum/templates/heat-mesos/elements/docker/post-install.d/60-disable-docker-service b/magnum/templates/mesos/elements/docker/post-install.d/60-disable-docker-service similarity index 100% rename from magnum/templates/heat-mesos/elements/docker/post-install.d/60-disable-docker-service rename to magnum/templates/mesos/elements/docker/post-install.d/60-disable-docker-service diff --git a/magnum/templates/heat-mesos/elements/docker/pre-install.d/10-add-docker-repo b/magnum/templates/mesos/elements/docker/pre-install.d/10-add-docker-repo similarity index 100% rename from magnum/templates/heat-mesos/elements/docker/pre-install.d/10-add-docker-repo rename to magnum/templates/mesos/elements/docker/pre-install.d/10-add-docker-repo diff --git a/magnum/templates/heat-mesos/elements/mesos/elements-deps b/magnum/templates/mesos/elements/mesos/elements-deps similarity index 100% rename from magnum/templates/heat-mesos/elements/mesos/elements-deps rename to magnum/templates/mesos/elements/mesos/elements-deps diff --git a/magnum/templates/heat-mesos/elements/mesos/package-installs.yaml b/magnum/templates/mesos/elements/mesos/package-installs.yaml similarity index 100% rename from magnum/templates/heat-mesos/elements/mesos/package-installs.yaml rename to magnum/templates/mesos/elements/mesos/package-installs.yaml diff --git a/magnum/templates/heat-mesos/elements/mesos/post-install.d/60-disable-upstart b/magnum/templates/mesos/elements/mesos/post-install.d/60-disable-upstart similarity index 100% rename from magnum/templates/heat-mesos/elements/mesos/post-install.d/60-disable-upstart rename to magnum/templates/mesos/elements/mesos/post-install.d/60-disable-upstart diff --git a/magnum/templates/heat-mesos/elements/mesos/pre-install.d/10-apt-repo b/magnum/templates/mesos/elements/mesos/pre-install.d/10-apt-repo similarity index 100% rename from magnum/templates/heat-mesos/elements/mesos/pre-install.d/10-apt-repo rename to magnum/templates/mesos/elements/mesos/pre-install.d/10-apt-repo diff --git a/magnum/templates/heat-mesos/fragments/configure-mesos-master.sh b/magnum/templates/mesos/fragments/configure-mesos-master.sh similarity index 100% rename from magnum/templates/heat-mesos/fragments/configure-mesos-master.sh rename to magnum/templates/mesos/fragments/configure-mesos-master.sh diff --git a/magnum/templates/heat-mesos/fragments/configure-mesos-slave.sh b/magnum/templates/mesos/fragments/configure-mesos-slave.sh similarity index 100% rename from magnum/templates/heat-mesos/fragments/configure-mesos-slave.sh rename to magnum/templates/mesos/fragments/configure-mesos-slave.sh diff --git a/magnum/templates/heat-mesos/fragments/start-services-master.sh b/magnum/templates/mesos/fragments/start-services-master.sh similarity index 100% rename from magnum/templates/heat-mesos/fragments/start-services-master.sh rename to magnum/templates/mesos/fragments/start-services-master.sh diff --git a/magnum/templates/heat-mesos/fragments/start-services-slave.sh b/magnum/templates/mesos/fragments/start-services-slave.sh similarity index 100% rename from magnum/templates/heat-mesos/fragments/start-services-slave.sh rename to magnum/templates/mesos/fragments/start-services-slave.sh diff --git a/magnum/templates/heat-mesos/fragments/write-heat-params-master.yaml b/magnum/templates/mesos/fragments/write-heat-params-master.yaml similarity index 100% rename from magnum/templates/heat-mesos/fragments/write-heat-params-master.yaml rename to magnum/templates/mesos/fragments/write-heat-params-master.yaml diff --git a/magnum/templates/heat-mesos/fragments/write-heat-params.yaml b/magnum/templates/mesos/fragments/write-heat-params.yaml similarity index 100% rename from magnum/templates/heat-mesos/fragments/write-heat-params.yaml rename to magnum/templates/mesos/fragments/write-heat-params.yaml diff --git a/magnum/templates/heat-mesos/mesoscluster.yaml b/magnum/templates/mesos/mesoscluster.yaml similarity index 100% rename from magnum/templates/heat-mesos/mesoscluster.yaml rename to magnum/templates/mesos/mesoscluster.yaml diff --git a/magnum/templates/heat-mesos/mesosslave.yaml b/magnum/templates/mesos/mesosslave.yaml similarity index 100% rename from magnum/templates/heat-mesos/mesosslave.yaml rename to magnum/templates/mesos/mesosslave.yaml diff --git a/magnum/templates/heat-mesos/COPYING b/magnum/templates/swarm/COPYING similarity index 100% rename from magnum/templates/heat-mesos/COPYING rename to magnum/templates/swarm/COPYING diff --git a/magnum/templates/docker-swarm/README.md b/magnum/templates/swarm/README.md similarity index 100% rename from magnum/templates/docker-swarm/README.md rename to magnum/templates/swarm/README.md diff --git a/magnum/templates/docker-swarm/fragments/add-proxy.sh b/magnum/templates/swarm/fragments/add-proxy.sh similarity index 100% rename from magnum/templates/docker-swarm/fragments/add-proxy.sh rename to magnum/templates/swarm/fragments/add-proxy.sh diff --git a/magnum/templates/docker-swarm/fragments/cfn-signal.sh b/magnum/templates/swarm/fragments/cfn-signal.sh similarity index 100% rename from magnum/templates/docker-swarm/fragments/cfn-signal.sh rename to magnum/templates/swarm/fragments/cfn-signal.sh diff --git a/magnum/templates/docker-swarm/fragments/configure-swarm.sh b/magnum/templates/swarm/fragments/configure-swarm.sh similarity index 100% rename from magnum/templates/docker-swarm/fragments/configure-swarm.sh rename to magnum/templates/swarm/fragments/configure-swarm.sh diff --git a/magnum/templates/heat-kubernetes/fragments/disable-selinux.sh b/magnum/templates/swarm/fragments/disable-selinux.sh similarity index 100% rename from magnum/templates/heat-kubernetes/fragments/disable-selinux.sh rename to magnum/templates/swarm/fragments/disable-selinux.sh diff --git a/magnum/templates/docker-swarm/fragments/enable-services.sh b/magnum/templates/swarm/fragments/enable-services.sh similarity index 100% rename from magnum/templates/docker-swarm/fragments/enable-services.sh rename to magnum/templates/swarm/fragments/enable-services.sh diff --git a/magnum/templates/docker-swarm/fragments/make-cert.py b/magnum/templates/swarm/fragments/make-cert.py similarity index 100% rename from magnum/templates/docker-swarm/fragments/make-cert.py rename to magnum/templates/swarm/fragments/make-cert.py diff --git a/magnum/templates/docker-swarm/fragments/remove-docker-key.sh b/magnum/templates/swarm/fragments/remove-docker-key.sh similarity index 100% rename from magnum/templates/docker-swarm/fragments/remove-docker-key.sh rename to magnum/templates/swarm/fragments/remove-docker-key.sh diff --git a/magnum/templates/docker-swarm/fragments/write-bay-failure-service.yaml b/magnum/templates/swarm/fragments/write-bay-failure-service.yaml similarity index 100% rename from magnum/templates/docker-swarm/fragments/write-bay-failure-service.yaml rename to magnum/templates/swarm/fragments/write-bay-failure-service.yaml diff --git a/magnum/templates/docker-swarm/fragments/write-docker-service.sh b/magnum/templates/swarm/fragments/write-docker-service.sh similarity index 100% rename from magnum/templates/docker-swarm/fragments/write-docker-service.sh rename to magnum/templates/swarm/fragments/write-docker-service.sh diff --git a/magnum/templates/docker-swarm/fragments/write-docker-socket.yaml b/magnum/templates/swarm/fragments/write-docker-socket.yaml similarity index 100% rename from magnum/templates/docker-swarm/fragments/write-docker-socket.yaml rename to magnum/templates/swarm/fragments/write-docker-socket.yaml diff --git a/magnum/templates/docker-swarm/fragments/write-heat-params.yaml b/magnum/templates/swarm/fragments/write-heat-params.yaml similarity index 100% rename from magnum/templates/docker-swarm/fragments/write-heat-params.yaml rename to magnum/templates/swarm/fragments/write-heat-params.yaml diff --git a/magnum/templates/docker-swarm/fragments/write-swarm-agent-service.yaml b/magnum/templates/swarm/fragments/write-swarm-agent-service.yaml similarity index 100% rename from magnum/templates/docker-swarm/fragments/write-swarm-agent-service.yaml rename to magnum/templates/swarm/fragments/write-swarm-agent-service.yaml diff --git a/magnum/templates/docker-swarm/fragments/write-swarm-master-service.sh b/magnum/templates/swarm/fragments/write-swarm-master-service.sh similarity index 100% rename from magnum/templates/docker-swarm/fragments/write-swarm-master-service.sh rename to magnum/templates/swarm/fragments/write-swarm-master-service.sh diff --git a/magnum/templates/docker-swarm/swarm.yaml b/magnum/templates/swarm/swarm.yaml similarity index 100% rename from magnum/templates/docker-swarm/swarm.yaml rename to magnum/templates/swarm/swarm.yaml diff --git a/magnum/templates/docker-swarm/swarmnode.yaml b/magnum/templates/swarm/swarmnode.yaml similarity index 100% rename from magnum/templates/docker-swarm/swarmnode.yaml rename to magnum/templates/swarm/swarmnode.yaml diff --git a/specs/container-networking-model.rst b/specs/container-networking-model.rst index e253550b84..8c25e62896 100644 --- a/specs/container-networking-model.rst +++ b/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