openstack/deb-magnum
Code Issues Proposed changes

Merge "Add Swarm TemplateDefinition"

Browse Source
This commit is contained in:
Jenkins
2015-04-18 05:20:09 +00:00
committed by Gerrit Code Review
parent c9defb8722 6d64188d50
commit f4b5640c54
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]
@@ -431,6 +435,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)