From f6d336b755d90ec5e3bf49cb7db0ff0f9840f3bb Mon Sep 17 00:00:00 2001 From: "Kai Qiang Wu(Kennan)" Date: Wed, 8 Jul 2015 09:12:37 +0000 Subject: [PATCH] Fix old network_id usage In heat guide http://docs.openstack.org/hot-reference/content/ OS__Neutron__FloatingIP.html floating_network_id is deprecated. and also for OS::Neutron::Router network properties can be with name or id. Change-Id: Icb119c36e4abac1facf447773ec46f21b2b863b8 Closes-Bug: #1472532 --- magnum/conductor/template_definition.py | 2 +- magnum/templates/docker-swarm/README.md | 4 ++-- magnum/templates/docker-swarm/swarm.yaml | 12 ++++++------ magnum/templates/docker-swarm/swarmnode.yaml | 8 ++++---- .../unit/conductor/handlers/test_bay_conductor.py | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/magnum/conductor/template_definition.py b/magnum/conductor/template_definition.py index 2314c81e56..98af6ac027 100644 --- a/magnum/conductor/template_definition.py +++ b/magnum/conductor/template_definition.py @@ -374,7 +374,7 @@ class AtomicSwarmTemplateDefinition(BaseTemplateDefinition): param_type=str) self.add_parameter('server_flavor', baymodel_attr='flavor_id') - self.add_parameter('external_network_id', + self.add_parameter('external_network', baymodel_attr='external_network_id', required=True) diff --git a/magnum/templates/docker-swarm/README.md b/magnum/templates/docker-swarm/README.md index e0eea71492..7948370ce5 100644 --- a/magnum/templates/docker-swarm/README.md +++ b/magnum/templates/docker-swarm/README.md @@ -37,7 +37,7 @@ your environment: parameters: 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 server_image: fedora-21-atomic-3 discovery_url: token://d8cdfe5128af6e1075b34aa06ff1cc2c @@ -49,7 +49,7 @@ And then create the stack, referencing that environment file: You must provide values for: - `ssh_key_name` -- `external_network_id` +- `external_network` - `server_image` - `discovery_url` diff --git a/magnum/templates/docker-swarm/swarm.yaml b/magnum/templates/docker-swarm/swarm.yaml index 9194a05e93..0ff4f496d2 100644 --- a/magnum/templates/docker-swarm/swarm.yaml +++ b/magnum/templates/docker-swarm/swarm.yaml @@ -17,9 +17,9 @@ parameters: type: string description: name of ssh key to be provisioned on our server - external_network_id: + external_network: 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: type: string @@ -119,7 +119,7 @@ resources: properties: external_gateway_info: network: - get_param: external_network_id + get_param: external_network # attached fixed_subnet to our extrouter router. extrouter_inside: @@ -288,8 +288,8 @@ resources: depends_on: - extrouter_inside properties: - floating_network_id: - get_param: external_network_id + floating_network: + get_param: external_network port_id: get_resource: swarm_manager_eth0 @@ -307,7 +307,7 @@ resources: server_flavor: {get_param: server_flavor} fixed_network_id: {get_resource: fixed_network} 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} outputs: diff --git a/magnum/templates/docker-swarm/swarmnode.yaml b/magnum/templates/docker-swarm/swarmnode.yaml index 1c468d9f44..794ed05ddf 100644 --- a/magnum/templates/docker-swarm/swarmnode.yaml +++ b/magnum/templates/docker-swarm/swarmnode.yaml @@ -22,9 +22,9 @@ parameters: description: name of ssh key to be provisioned on our server default: lars - external_network_id: + external_network: 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: type: string @@ -198,8 +198,8 @@ resources: swarm_node_floating: type: "OS::Neutron::FloatingIP" properties: - floating_network_id: - get_param: external_network_id + floating_network: + get_param: external_network port_id: get_resource: swarm_node_eth0 diff --git a/magnum/tests/unit/conductor/handlers/test_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_bay_conductor.py index 99c421030f..2d678fec89 100644 --- a/magnum/tests/unit/conductor/handlers/test_bay_conductor.py +++ b/magnum/tests/unit/conductor/handlers/test_bay_conductor.py @@ -701,7 +701,7 @@ class TestBayConductorWithSwarm(base.TestCase): expected = { 'ssh_key_name': 'keypair_id', - 'external_network_id': 'external_network_id', + 'external_network': 'external_network_id', 'dns_nameserver': 'dns_nameserver', 'server_image': 'image_id', 'server_flavor': 'flavor_id', @@ -735,7 +735,7 @@ class TestBayConductorWithSwarm(base.TestCase): expected = { 'ssh_key_name': 'keypair_id', - 'external_network_id': 'external_network_id', + 'external_network': 'external_network_id', 'number_of_nodes': '1', 'discovery_url': 'test_discovery' }