openstack
/
magnum
Code Issues Proposed changes

Merge "Fix old network_id usage"

This commit is contained in:
Jenkins 2015-07-09 16:43:36 +00:00 committed by Gerrit Code Review
parent 2385f2761a f6d336b755
commit de608c2773
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/conductor/template_definition.py
View File

@ -379,7 +379,7 @@ class AtomicSwarmTemplateDefinition(BaseTemplateDefinition):
param_type=str) param_type=str)
self.add_parameter('server_flavor', self.add_parameter('server_flavor',
baymodel_attr='flavor_id') baymodel_attr='flavor_id')
self.add_parameter('external_network_id', self.add_parameter('external_network',
baymodel_attr='external_network_id', baymodel_attr='external_network_id',
required=True) required=True)

4
magnum/templates/docker-swarm/README.md
View File

@ -37,7 +37,7 @@ your environment:
parameters: parameters:
ssh_key_name: apmelton ssh_key_name: apmelton
external_network_id: 028d70dd-67b8-4901-8bdd-0c62b06cce2d external_network: 028d70dd-67b8-4901-8bdd-0c62b06cce2d
dns_nameserver: 192.168.200.1 dns_nameserver: 192.168.200.1
server_image: fedora-21-atomic-3 server_image: fedora-21-atomic-3
discovery_url: token://d8cdfe5128af6e1075b34aa06ff1cc2c discovery_url: token://d8cdfe5128af6e1075b34aa06ff1cc2c
@ -49,7 +49,7 @@ And then create the stack, referencing that environment file:
You must provide values for: You must provide values for:
- `ssh_key_name` - `ssh_key_name`
- `external_network_id` - `external_network`
- `server_image` - `server_image`
- `discovery_url` - `discovery_url`

12
magnum/templates/docker-swarm/swarm.yaml
View File

@ -17,9 +17,9 @@ parameters:
type: string type: string
description: name of ssh key to be provisioned on our server description: name of ssh key to be provisioned on our server
external_network_id: external_network:
type: string type: string
description: uuid of a network to use for floating ip addresses description: uuid/name of a network to use for floating ip addresses
discovery_url: discovery_url:
type: string type: string
@ -119,7 +119,7 @@ resources:
properties: properties:
external_gateway_info: external_gateway_info:
network: network:
get_param: external_network_id get_param: external_network
# attached fixed_subnet to our extrouter router. # attached fixed_subnet to our extrouter router.
extrouter_inside: extrouter_inside:
@ -288,8 +288,8 @@ resources:
depends_on: depends_on:
- extrouter_inside - extrouter_inside
properties: properties:
floating_network_id: floating_network:
get_param: external_network_id get_param: external_network
port_id: port_id:
get_resource: swarm_manager_eth0 get_resource: swarm_manager_eth0
@ -307,7 +307,7 @@ resources:
server_flavor: {get_param: server_flavor} server_flavor: {get_param: server_flavor}
fixed_network_id: {get_resource: fixed_network} fixed_network_id: {get_resource: fixed_network}
fixed_subnet_id: {get_resource: fixed_subnet} fixed_subnet_id: {get_resource: fixed_subnet}
external_network_id: {get_param: external_network_id} external_network: {get_param: external_network}
discovery_url: {get_param: discovery_url} discovery_url: {get_param: discovery_url}
outputs: outputs:

8
magnum/templates/docker-swarm/swarmnode.yaml
View File

@ -22,9 +22,9 @@ parameters:
description: name of ssh key to be provisioned on our server description: name of ssh key to be provisioned on our server
default: lars default: lars
external_network_id: external_network:
type: string type: string
description: uuid of a network to use for floating ip addresses description: uuid/name of a network to use for floating ip addresses
fixed_network_id: fixed_network_id:
type: string type: string
@ -198,8 +198,8 @@ resources:
swarm_node_floating: swarm_node_floating:
type: "OS::Neutron::FloatingIP" type: "OS::Neutron::FloatingIP"
properties: properties:
floating_network_id: floating_network:
get_param: external_network_id get_param: external_network
port_id: port_id:
get_resource: swarm_node_eth0 get_resource: swarm_node_eth0

4
magnum/tests/unit/conductor/handlers/test_bay_conductor.py
View File

@ -704,7 +704,7 @@ class TestBayConductorWithSwarm(base.TestCase):
expected = { expected = {
'ssh_key_name': 'keypair_id', 'ssh_key_name': 'keypair_id',
'external_network_id': 'external_network_id', 'external_network': 'external_network_id',
'dns_nameserver': 'dns_nameserver', 'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id', 'server_image': 'image_id',
'server_flavor': 'flavor_id', 'server_flavor': 'flavor_id',
@ -738,7 +738,7 @@ class TestBayConductorWithSwarm(base.TestCase):
expected = { expected = {
'ssh_key_name': 'keypair_id', 'ssh_key_name': 'keypair_id',
'external_network_id': 'external_network_id', 'external_network': 'external_network_id',
'number_of_nodes': '1', 'number_of_nodes': '1',
'discovery_url': 'test_discovery' 'discovery_url': 'test_discovery'
} }