Backport "kubenode -> kubeminion"

Change kube_node to kube_minion
Change server_flavor to minion_flavor

heat-coe-templates: I90c44e52dfb0920e88c754222485519e9ea2d029

Change-Id: I45b3c29d2f6ce270df606062e8c3d3eb4cfc8a08
This commit is contained in:
Tom Cammann 2015-05-22 14:22:16 -07:00
parent 3d8720a0b8
commit 7abf252ac5
4 changed files with 37 additions and 35 deletions

View File

@ -287,8 +287,6 @@ class BaseTemplateDefinition(TemplateDefinition):
self.add_parameter('server_image',
baymodel_attr='image_id')
self.add_parameter('server_flavor',
baymodel_attr='flavor_id')
self.add_parameter('dns_nameserver',
baymodel_attr='dns_nameserver')
self.add_parameter('fixed_network_cidr',
@ -308,6 +306,8 @@ class AtomicK8sTemplateDefinition(BaseTemplateDefinition):
super(AtomicK8sTemplateDefinition, self).__init__()
self.add_parameter('master_flavor',
baymodel_attr='master_flavor_id')
self.add_parameter('minion_flavor',
baymodel_attr='flavor_id')
self.add_parameter('number_of_minions',
bay_attr='node_count',
param_type=str)
@ -372,6 +372,8 @@ class AtomicSwarmTemplateDefinition(BaseTemplateDefinition):
self.add_parameter('number_of_nodes',
bay_attr='node_count',
param_type=str)
self.add_parameter('server_flavor',
baymodel_attr='flavor_id')
self.add_output('swarm_manager',
bay_attr='api_address')

View File

@ -31,7 +31,7 @@ parameters:
default: m1.small
description: flavor to use when booting the server
server_flavor:
minion_flavor:
type: string
default: m1.small
description: flavor to use when booting the server
@ -314,11 +314,11 @@ resources:
properties:
count: {get_param: number_of_minions}
resource_def:
type: kubenode.yaml
type: kubeminion.yaml
properties:
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}
server_flavor: {get_param: server_flavor}
minion_flavor: {get_param: minion_flavor}
fixed_network_id: {get_resource: fixed_network}
fixed_subnet_id: {get_resource: fixed_subnet}
kube_master_ip: {get_attr: [kube_master_eth0, fixed_ips, 0, ip_address]}
@ -332,8 +332,8 @@ outputs:
value: {get_attr: [kube_master_floating, floating_ip_address]}
kube_minions:
value: {get_attr: [kube_minions, kube_node_ip]}
value: {get_attr: [kube_minions, kube_minion_ip]}
kube_minions_external:
value: {get_attr: [kube_minions, kube_node_external_ip]}
value: {get_attr: [kube_minions, kube_minion_external_ip]}

View File

@ -12,7 +12,7 @@ parameters:
default: centos-7-atomic-20150120
description: glance image used to boot the server
server_flavor:
minion_flavor:
type: string
default: m1.small
description: flavor to use when booting the server
@ -60,7 +60,7 @@ resources:
node_wait_condition:
type: "AWS::CloudFormation::WaitCondition"
depends_on:
- kube_node
- kube_minion
properties:
Handle:
get_resource: node_wait_handle
@ -153,7 +153,7 @@ resources:
group: ungrouped
config: {get_file: fragments/disable-selinux.sh}
kube_node_init:
kube_minion_init:
type: "OS::Heat::MultipartMime"
properties:
parts:
@ -168,22 +168,22 @@ resources:
- config: {get_resource: enable_services}
- config: {get_resource: cfn_signal}
kube_node:
kube_minion:
type: "OS::Nova::Server"
properties:
image:
get_param: server_image
flavor:
get_param: server_flavor
get_param: minion_flavor
key_name:
get_param: ssh_key_name
user_data_format: RAW
user_data: {get_resource: kube_node_init}
user_data: {get_resource: kube_minion_init}
networks:
- port:
get_resource: kube_node_eth0
get_resource: kube_minion_eth0
kube_node_eth0:
kube_minion_eth0:
type: "OS::Neutron::Port"
properties:
network_id:
@ -195,13 +195,13 @@ resources:
get_param: fixed_subnet_id
replacement_policy: AUTO
kube_node_floating:
kube_minion_floating:
type: "OS::Neutron::FloatingIP"
properties:
floating_network_id:
get_param: external_network_id
port_id:
get_resource: kube_node_eth0
get_resource: kube_minion_eth0
docker_volume:
type: "OS::Cinder::Volume"
@ -211,14 +211,14 @@ resources:
docker_volume_attach:
type: "OS::Cinder::VolumeAttachment"
properties:
instance_uuid: {get_resource: kube_node}
instance_uuid: {get_resource: kube_minion}
volume_id: {get_resource: docker_volume}
outputs:
kube_node_ip:
value: {get_attr: [kube_node_eth0, fixed_ips, 0, ip_address]}
kube_node_external_ip:
value: {get_attr: [kube_node_floating, floating_ip_address]}
kube_minion_ip:
value: {get_attr: [kube_minion_eth0, fixed_ips, 0, ip_address]}
kube_minion_external_ip:
value: {get_attr: [kube_minion_floating, floating_ip_address]}

View File

@ -78,7 +78,7 @@ class TestBayK8sHeat(base.TestCase):
'external_network_id': 'external_network_id',
'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'master_flavor': 'master_flavor_id',
'number_of_minions': '1',
'fixed_network_cidr': '10.20.30.0/24',
@ -111,7 +111,7 @@ class TestBayK8sHeat(base.TestCase):
'external_network_id': 'external_network_id',
'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'master_flavor': 'master_flavor_id',
'number_of_minions': '1',
'fixed_network_cidr': '10.20.30.0/24',
@ -146,7 +146,7 @@ class TestBayK8sHeat(base.TestCase):
'external_network_id': 'external_network_id',
'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'master_flavor': 'master_flavor_id',
'number_of_minions': '1',
'fixed_network_cidr': '10.20.30.0/24',
@ -173,7 +173,7 @@ class TestBayK8sHeat(base.TestCase):
'ssh_key_name': 'keypair_id',
'external_network_id': 'external_network_id',
'server_image': 'image_id',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'master_flavor': 'master_flavor_id',
'number_of_minions': '1',
'fixed_network_cidr': '10.20.30.0/24',
@ -198,7 +198,7 @@ class TestBayK8sHeat(base.TestCase):
'ssh_key_name': 'keypair_id',
'external_network_id': 'external_network_id',
'dns_nameserver': 'dns_nameserver',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'master_flavor': 'master_flavor_id',
'number_of_minions': '1',
'fixed_network_cidr': '10.20.30.0/24',
@ -207,7 +207,7 @@ class TestBayK8sHeat(base.TestCase):
self.assertEqual(expected, definition)
@patch('magnum.objects.BayModel.get_by_uuid')
def test_extract_template_definition_without_server_flavor(self,
def test_extract_template_definition_without_minion_flavor(self,
mock_objects_baymodel_get_by_uuid):
baymodel_dict = self.baymodel_dict
baymodel_dict['flavor_id'] = None
@ -249,7 +249,7 @@ class TestBayK8sHeat(base.TestCase):
'external_network_id': 'external_network_id',
'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'fixed_network_cidr': '10.20.30.0/24',
'master_flavor': 'master_flavor_id',
'number_of_minions': '1',
@ -275,7 +275,7 @@ class TestBayK8sHeat(base.TestCase):
'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id',
'master_flavor': 'master_flavor_id',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'number_of_minions': '1',
'docker_volume_size': 20,
}
@ -299,7 +299,7 @@ class TestBayK8sHeat(base.TestCase):
'external_network_id': 'external_network_id',
'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'number_of_minions': '1',
'fixed_network_cidr': '10.20.30.0/24',
'docker_volume_size': 20,
@ -326,7 +326,7 @@ class TestBayK8sHeat(base.TestCase):
'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id',
'master_flavor': 'master_flavor_id',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'number_of_minions': '1',
'fixed_network_cidr': '10.20.30.0/24',
'docker_volume_size': 20,
@ -353,7 +353,7 @@ class TestBayK8sHeat(base.TestCase):
'external_network_id': 'external_network_id',
'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'master_flavor': 'master_flavor_id',
'number_of_minions': '1',
'fixed_network_cidr': '10.20.30.0/24',
@ -379,7 +379,7 @@ class TestBayK8sHeat(base.TestCase):
'external_network_id': 'external_network_id',
'dns_nameserver': 'dns_nameserver',
'server_image': 'image_id',
'server_flavor': 'flavor_id',
'minion_flavor': 'flavor_id',
'fixed_network_cidr': '10.20.30.0/24',
'master_flavor': 'master_flavor_id',
'docker_volume_size': 20,