openstack
/
magnum
Code Issues Proposed changes

Swarm: Cleanup of swarm heat template 

This patch does some cleanup work in swarm heat template including description,
typo fixes, removal of default in nested template.

Also updated magnum.conf.example.

Closes-Bug: #1524134
Change-Id: Id0dd345150aba4cf88df5a7d9ac85dcbb100e3d0
This commit is contained in:
Eli Qiao 2015-12-08 16:08:12 +08:00
parent 554af35b74
commit a1fbf36736
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,7 @@
# Location of template to build a swarm cluster on atomic. (string
# value)
#swarm_atomic_template_path = $pybasedir/templates/swarm/swarm.yaml
#swarm_atomic_template_path = $pybasedir/templates/swarm/swarmcluster.yaml
# Location of template to build a Mesos cluster on Ubuntu. (string
# value)

2
magnum/templates/swarm/swarmcluster.yaml
View File

@ -2,7 +2,7 @@ heat_template_version: 2013-05-23
description: >
This template will boot a Docker swarm cluster. A swarm cluster is made up
of several master node, and N agent nodes. Every node in the cluster,
of several master nodes, and N agent nodes. Every node in the cluster,
including the master, is running a Docker daemon and a swarm agent
advertising it to the cluster. The master is running an addition swarm
master container listening on port 2376. By default, the cluster is made

8
magnum/templates/swarm/swarmmaster.yaml
View File

@ -1,15 +1,12 @@
heat_template_version: 2013-05-23
description: >
This template will boot a Docker swarm master node. A swarm mater node is
This is a nested stack that defines swarm master node. A swarm mater node is
running a Docker daemon and a swarm master container listening on port 2376,
and a swarm agent advertising it to the cluster.
parameters:
#
# REQUIRED PARAMETERS
#
ssh_key_name:
type: string
description: name of ssh key to be provisioned on our server
@ -103,7 +100,6 @@ parameters:
swarm_version:
type: string
description: version of swarm used for swarm cluster
default: 1.0.0
secgroup_swarm_master_id:
type: string
@ -124,7 +120,7 @@ parameters:
etcd_server_ip:
type: string
description: ID of the load balancer pool of etcd server.
description: ip address of the load balancer pool of etcd server.
resources:

12
magnum/templates/swarm/swarmnode.yaml
View File

@ -3,24 +3,21 @@ heat_template_version: 2013-05-23
description: >
This is a nested stack that defines a single swarm node,
based on a vanilla Fedora 20 cloud image. This stack is included by
a ResourceGroup resource in the parent template (swarm.yaml).
a ResourceGroup resource in the parent template (swarmcluster.yaml).
parameters:
server_image:
type: string
default: fedora-atomic
description: glance image used to boot the server
server_flavor:
type: string
default: m1.small
description: flavor to use when booting the server
ssh_key_name:
type: string
description: name of ssh key to be provisioned on our server
default: lars
docker_volume_size:
type: number
@ -43,7 +40,6 @@ parameters:
network_driver:
type: string
description: network driver to use for instantiating container networks
default: None
discovery_url:
type: string
@ -52,17 +48,14 @@ parameters:
http_proxy:
type: string
description: http proxy address for docker
default: ""
https_proxy:
type: string
description: https proxy address for docker
default: ""
no_proxy:
type: string
description: no proxies for docker
default: ""
swarm_api_ip:
type: string
@ -91,7 +84,6 @@ parameters:
swarm_version:
type: string
description: version of swarm used for swarm cluster
default: 1.0.0
secgroup_swarm_node_id:
type: string
@ -99,7 +91,7 @@ parameters:
etcd_server_ip:
type: string
description: ID of the load balancer pool of etcd serve.
description: ip address of the load balancer pool of etcd server.
resources: