Separate flavor between master and agent node
Swarm agent has been moved out of master node in the depending patch, so it is appropriate to separate the flavor now Co-Authored-By: Hongbin Lu <hongbin.lu@huawei.com> Closes-Bug: #1498570 Change-Id: I6f5f15274a10f503a2554ec554e5c822f47a39dc
This commit is contained in:
parent
1cb84d0fd4
commit
7a0d43f82c
|
@ -555,7 +555,9 @@ class AtomicSwarmTemplateDefinition(BaseTemplateDefinition):
|
||||||
param_type=str)
|
param_type=str)
|
||||||
self.add_parameter('number_of_nodes',
|
self.add_parameter('number_of_nodes',
|
||||||
bay_attr='node_count')
|
bay_attr='node_count')
|
||||||
self.add_parameter('server_flavor',
|
self.add_parameter('master_flavor',
|
||||||
|
baymodel_attr='master_flavor_id')
|
||||||
|
self.add_parameter('node_flavor',
|
||||||
baymodel_attr='flavor_id')
|
baymodel_attr='flavor_id')
|
||||||
self.add_parameter('docker_volume_size',
|
self.add_parameter('docker_volume_size',
|
||||||
baymodel_attr='docker_volume_size')
|
baymodel_attr='docker_volume_size')
|
||||||
|
|
|
@ -45,10 +45,15 @@ parameters:
|
||||||
default: fedora-atomic
|
default: fedora-atomic
|
||||||
description: glance image used to boot the server
|
description: glance image used to boot the server
|
||||||
|
|
||||||
server_flavor:
|
master_flavor:
|
||||||
type: string
|
type: string
|
||||||
default: m1.small
|
default: m1.small
|
||||||
description: flavor to use when booting the server
|
description: flavor to use when booting the swarm master
|
||||||
|
|
||||||
|
node_flavor:
|
||||||
|
type: string
|
||||||
|
default: m1.small
|
||||||
|
description: flavor to use when booting the swarm node
|
||||||
|
|
||||||
dns_nameserver:
|
dns_nameserver:
|
||||||
type: string
|
type: string
|
||||||
|
@ -264,7 +269,7 @@ resources:
|
||||||
properties:
|
properties:
|
||||||
ssh_key_name: {get_param: ssh_key_name}
|
ssh_key_name: {get_param: ssh_key_name}
|
||||||
server_image: {get_param: server_image}
|
server_image: {get_param: server_image}
|
||||||
server_flavor: {get_param: server_flavor}
|
server_flavor: {get_param: master_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: {get_param: external_network}
|
external_network: {get_param: external_network}
|
||||||
|
@ -301,7 +306,7 @@ resources:
|
||||||
properties:
|
properties:
|
||||||
ssh_key_name: {get_param: ssh_key_name}
|
ssh_key_name: {get_param: ssh_key_name}
|
||||||
server_image: {get_param: server_image}
|
server_image: {get_param: server_image}
|
||||||
server_flavor: {get_param: server_flavor}
|
server_flavor: {get_param: node_flavor}
|
||||||
docker_volume_size: {get_param: docker_volume_size}
|
docker_volume_size: {get_param: docker_volume_size}
|
||||||
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}
|
||||||
|
|
|
@ -28,6 +28,7 @@ class TestBayConductorWithSwarm(base.TestCase):
|
||||||
self.baymodel_dict = {
|
self.baymodel_dict = {
|
||||||
'image_id': 'image_id',
|
'image_id': 'image_id',
|
||||||
'flavor_id': 'flavor_id',
|
'flavor_id': 'flavor_id',
|
||||||
|
'master_flavor_id': 'master_flavor_id',
|
||||||
'keypair_id': 'keypair_id',
|
'keypair_id': 'keypair_id',
|
||||||
'dns_nameserver': 'dns_nameserver',
|
'dns_nameserver': 'dns_nameserver',
|
||||||
'docker_volume_size': 20,
|
'docker_volume_size': 20,
|
||||||
|
@ -83,7 +84,8 @@ class TestBayConductorWithSwarm(base.TestCase):
|
||||||
'external_network': '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',
|
'master_flavor': 'master_flavor_id',
|
||||||
|
'node_flavor': 'flavor_id',
|
||||||
'number_of_masters': 1,
|
'number_of_masters': 1,
|
||||||
'number_of_nodes': 1,
|
'number_of_nodes': 1,
|
||||||
'docker_volume_size': 20,
|
'docker_volume_size': 20,
|
||||||
|
@ -110,7 +112,8 @@ class TestBayConductorWithSwarm(base.TestCase):
|
||||||
|
|
||||||
not_required = ['image_id', 'flavor_id', 'dns_nameserver',
|
not_required = ['image_id', 'flavor_id', 'dns_nameserver',
|
||||||
'docker_volume_size', 'fixed_network', 'http_proxy',
|
'docker_volume_size', 'fixed_network', 'http_proxy',
|
||||||
'https_proxy', 'no_proxy', 'network_driver']
|
'https_proxy', 'no_proxy', 'network_driver',
|
||||||
|
'master_flavor_id']
|
||||||
for key in not_required:
|
for key in not_required:
|
||||||
self.baymodel_dict[key] = None
|
self.baymodel_dict[key] = None
|
||||||
self.bay_dict['discovery_url'] = 'https://discovery.etcd.io/test'
|
self.bay_dict['discovery_url'] = 'https://discovery.etcd.io/test'
|
||||||
|
|
Loading…
Reference in New Issue