openstack/deb-magnum
Code Issues Proposed changes

Add Swarm TemplateDefinition

Browse Source 
This change will allow deployers to select either Kubernetes
or Swarm to be the CoE used in Magnum's bays. A Swarm bay uses
a subset of the BayModel parameters used for Kubernetes.
Node discovery is provided via Docker's public discovery
endpoint, but operators and users can override this with
Bay's discovery_url argument.

Implements: bp multiple-bay-templates

Change-Id: I5278e6d477298085d07673810e5d8813d21b7730
This commit is contained in:
Andrew Melton
2015-04-14 20:42:27 -07:00
parent 784643e142
commit 6d64188d50
17 changed files with 328 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
etc/magnum/magnum.conf.sample
View File

@@ -229,8 +229,12 @@
# Deprecated group/name - [k8s_heat]/discovery_token_url
#coreos_discovery_token_url = <None>
# Location of template to build a swarm cluster on atomic. (string
# value)
#swarm_atomic_template_path = $pybasedir/templates/docker-swarm/swarm.yaml
# Enabled bay definition entry points. (list value)
#enabled_definitions = magnum_vm_atomic_k8s,magnum_vm_coreos_k8s
#enabled_definitions = magnum_vm_atomic_k8s,magnum_vm_coreos_k8s,magnum_vm_atomic_swarm
[conductor]
@@ -430,6 +434,10 @@
# Cluster types are fedora-atomic, coreos, ironic. (string value)
#cluster_type = fedora-atomic
# Container Orchestration Environments are kubernetes or swarm.
# (string value)
#cluster_coe = kubernetes
# Number of attempts to query the Heat stack for finding out the
# status of the created stack and getting url of the DU created in the
# stack (integer value)