openstack
/
magnum
Code Issues Proposed changes

The type of number_of_masters should be int not string

Browse Source 
number_of_masters, number_of_minions and number_of_nodes
should be number, not string.

Change-Id: Iac20023f0448aab313302c174e3743b95cd42d7a
Closes-Bug: #1524236
changes/38/255638/4
Hua Wang 7 years ago
parent a0a6b1d763
commit c5fc62ed28
8 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File

12
magnum/conductor/template_definition.py
Unescape View File

@ -348,8 +348,7 @@ class BaseTemplateDefinition(TemplateDefinition):
self.add_parameter('no_proxy',
baymodel_attr='no_proxy')
self.add_parameter('number_of_masters',
bay_attr='master_count',
param_type=str)
bay_attr='master_count')
@abc.abstractproperty
def template_path(self):
@ -446,8 +445,7 @@ class AtomicK8sTemplateDefinition(BaseTemplateDefinition):
self.add_parameter('minion_flavor',
baymodel_attr='flavor_id')
self.add_parameter('number_of_minions',
bay_attr='node_count',
param_type=str)
bay_attr='node_count')
self.add_parameter('docker_volume_size',
baymodel_attr='docker_volume_size')
self.add_parameter('external_network',
@ -556,8 +554,7 @@ class AtomicSwarmTemplateDefinition(BaseTemplateDefinition):
bay_attr='uuid',
param_type=str)
self.add_parameter('number_of_nodes',
bay_attr='node_count',
param_type=str)
bay_attr='node_count')
self.add_parameter('server_flavor',
baymodel_attr='flavor_id')
self.add_parameter('docker_volume_size',
@ -623,8 +620,7 @@ class UbuntuMesosTemplateDefinition(BaseTemplateDefinition):
baymodel_attr='external_network_id',
required=True)
self.add_parameter('number_of_slaves',
bay_attr='node_count',
param_type=str)
bay_attr='node_count')
self.add_parameter('master_flavor',
baymodel_attr='master_flavor_id')
self.add_parameter('slave_flavor',

2
magnum/templates/kubernetes/kubecluster-coreos.yaml
Unescape View File

@ -45,7 +45,7 @@ parameters:
default: 8.8.8.8
number_of_minions:
type: string
type: number
description: how many kubernetes minions to spawn
default: 1

2
magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml
Unescape View File

@ -34,7 +34,7 @@ parameters:
description: flavor to use when booting the server
number_of_minions:
type: string
type: number
description: how many kubernetes minions to spawn
default: 1

4
magnum/templates/kubernetes/kubecluster.yaml
Unescape View File

@ -36,12 +36,12 @@ parameters:
default: 8.8.8.8
number_of_masters:
type: string
type: number
description: how many kubernetes masters to spawn
default: 1
number_of_minions:
type: string
type: number
description: how many kubernetes minions to spawn
default: 1

4
magnum/templates/swarm/swarmcluster.yaml
Unescape View File

@ -71,12 +71,12 @@ parameters:
default: ""
number_of_masters:
type: string
type: number
description: how many swarm masters to spawn
default: 1
number_of_nodes:
type: string
type: number
description: how many swarm nodes to spawn
default: 1

20
magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
Unescape View File

@ -126,8 +126,8 @@ class TestBayConductorWithK8s(base.TestCase):
'server_image': 'image_id',
'minion_flavor': 'flavor_id',
'master_flavor': 'master_flavor_id',
'number_of_minions': '1',
'number_of_masters': '1',
'number_of_minions': 1,
'number_of_masters': 1,
'fixed_network_cidr': '10.20.30.0/24',
'docker_volume_size': 20,
'discovery_url': 'https://discovery.etcd.io/test',
@ -178,8 +178,8 @@ class TestBayConductorWithK8s(base.TestCase):
'server_image': 'image_id',
'minion_flavor': 'flavor_id',
'master_flavor': 'master_flavor_id',
'number_of_minions': '1',
'number_of_masters': '1',
'number_of_minions': 1,
'number_of_masters': 1,
'fixed_network_cidr': '10.20.30.0/24',
'network_driver': 'network_driver',
'docker_volume_size': 20,
@ -230,8 +230,8 @@ class TestBayConductorWithK8s(base.TestCase):
'server_image': 'image_id',
'minion_flavor': 'flavor_id',
'master_flavor': 'master_flavor_id',
'number_of_minions': '1',
'number_of_masters': '1',
'number_of_minions': 1,
'number_of_masters': 1,
'fixed_network_cidr': '10.20.30.0/24',
'network_driver': 'network_driver',
'docker_volume_size': 20,
@ -324,8 +324,8 @@ class TestBayConductorWithK8s(base.TestCase):
'server_image': 'image_id',
'master_flavor': 'master_flavor_id',
'minion_flavor': 'flavor_id',
'number_of_minions': '1',
'number_of_masters': '1',
'number_of_minions': 1,
'number_of_masters': 1,
'fixed_network_cidr': '10.20.30.0/24',
'network_driver': 'network_driver',
'docker_volume_size': 20,
@ -401,8 +401,8 @@ class TestBayConductorWithK8s(base.TestCase):
'server_image': 'image_id',
'master_flavor': 'master_flavor_id',
'minion_flavor': 'flavor_id',
'number_of_minions': '1',
'number_of_masters': '1',
'number_of_minions': 1,
'number_of_masters': 1,
'fixed_network_cidr': '10.20.30.0/24',
'network_driver': 'network_driver',
'docker_volume_size': 20,

8
magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
Unescape View File

@ -71,8 +71,8 @@ class TestBayConductorWithMesos(base.TestCase):
'server_image': 'image_id',
'master_flavor': 'master_flavor_id',
'slave_flavor': 'flavor_id',
'number_of_slaves': '1',
'number_of_masters': '1',
'number_of_slaves': 1,
'number_of_masters': 1,
'fixed_network_cidr': '10.2.0.0/22',
'http_proxy': 'http_proxy',
'https_proxy': 'https_proxy',
@ -101,8 +101,8 @@ class TestBayConductorWithMesos(base.TestCase):
expected = {
'ssh_key_name': 'keypair_id',
'external_network': 'external_network_id',
'number_of_slaves': '1',
'number_of_masters': '1',
'number_of_slaves': 1,
'number_of_masters': 1,
}
self.assertEqual(expected, definition)

8
magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
Unescape View File

@ -84,8 +84,8 @@ class TestBayConductorWithSwarm(base.TestCase):
'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id',
'server_flavor': 'flavor_id',
'number_of_masters': '1',
'number_of_nodes': '1',
'number_of_masters': 1,
'number_of_nodes': 1,
'docker_volume_size': 20,
'fixed_network_cidr': '10.2.0.0/22',
'discovery_url': 'https://discovery.test.io/123456789',
@ -126,8 +126,8 @@ class TestBayConductorWithSwarm(base.TestCase):
expected = {
'ssh_key_name': 'keypair_id',
'external_network': 'external_network_id',
'number_of_masters': '1',
'number_of_nodes': '1',
'number_of_masters': 1,
'number_of_nodes': 1,
'discovery_url': 'https://discovery.etcd.io/test',
'user_token': 'fake_token',
'bay_uuid': 'some_uuid',

Write Preview
Loading…
Cancel
Save