Merge "Clean-up server names in drivers"

This commit is contained in:
Jenkins 2017-08-28 09:49:55 +00:00 committed by Gerrit Code Review
commit 62afc249d1
18 changed files with 112 additions and 0 deletions

View File

@ -406,6 +406,10 @@ resources:
resource_def:
type: kubemaster.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'master', '%index%']
api_public_address: {get_attr: [api_lb, floating_address]}
api_private_address: {get_attr: [api_lb, address]}
ssh_key_name: {get_param: ssh_key_name}
@ -468,6 +472,10 @@ resources:
resource_def:
type: kubeminion.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'minion', '%index%']
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}
minion_flavor: {get_param: minion_flavor}

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
server_image:
type: string
description: glance image used to boot the server
@ -476,6 +480,7 @@ resources:
kube-master:
type: OS::Nova::Server
properties:
name: {get_param: name}
image: {get_param: server_image}
flavor: {get_param: master_flavor}
key_name: {get_param: ssh_key_name}

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
server_image:
type: string
description: glance image used to boot the server
@ -303,6 +307,7 @@ resources:
kube-minion:
type: OS::Nova::Server
properties:
name: {get_param: name}
image: {get_param: server_image}
flavor: {get_param: minion_flavor}
key_name: {get_param: ssh_key_name}

View File

@ -464,6 +464,10 @@ resources:
resource_def:
type: kubemaster.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'master', '%index%']
prometheus_monitoring: {get_param: prometheus_monitoring}
grafana_admin_passwd: {get_param: grafana_admin_passwd}
api_public_address: {get_attr: [api_lb, floating_address]}
@ -531,6 +535,10 @@ resources:
resource_def:
type: kubeminion.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'minion', '%index%']
prometheus_monitoring: {get_param: prometheus_monitoring}
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
server_image:
type: string
description: glance image used to boot the server
@ -495,6 +499,7 @@ resources:
kube-master:
type: OS::Nova::Server
properties:
name: {get_param: name}
image: {get_param: server_image}
flavor: {get_param: master_flavor}
key_name: {get_param: ssh_key_name}

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
server_image:
type: string
description: glance image used to boot the server
@ -397,6 +401,7 @@ resources:
kube-minion:
type: OS::Nova::Server
properties:
name: {get_param: name}
image: {get_param: server_image}
flavor: {get_param: minion_flavor}
key_name: {get_param: ssh_key_name}

View File

@ -440,6 +440,10 @@ resources:
resource_def:
type: kubemaster.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'master', '%index%']
prometheus_monitoring: {get_param: prometheus_monitoring}
grafana_admin_passwd: {get_param: grafana_admin_passwd}
api_public_address: {get_attr: [api_lb, floating_address]}
@ -516,6 +520,10 @@ resources:
resource_def:
type: kubeminion.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'minion', '%index%']
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}
minion_flavor: {get_param: minion_flavor}

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
server_image:
type: string
description: glance image used to boot the server
@ -465,6 +469,7 @@ resources:
kube-master:
type: OS::Nova::Server
properties:
name: {get_param: name}
image: {get_param: server_image}
flavor: {get_param: master_flavor}
key_name: {get_param: ssh_key_name}

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
server_image:
type: string
description: glance image used to boot the server
@ -57,6 +61,7 @@ resources:
kube-minion:
type: OS::Nova::Server
properties:
name: {get_param: name}
image: {get_param: server_image}
flavor: {get_param: minion_flavor}
key_name: {get_param: ssh_key_name}

View File

@ -375,6 +375,10 @@ resources:
resource_def:
type: mesosmaster.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'master', '%index%']
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}
master_flavor: {get_param: master_flavor}
@ -400,6 +404,10 @@ resources:
resource_def:
type: mesosslave.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'slave', '%index%']
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}
slave_flavor: {get_param: slave_flavor}

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
server_image:
type: string
description: glance image used to boot the server
@ -52,6 +56,7 @@ resources:
mesos-master:
type: OS::Nova::Server
properties:
name: {get_param: name}
image: {get_param: server_image}
flavor: {get_param: master_flavor}
key_name: {get_param: ssh_key_name}

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
server_image:
type: string
description: glance image used to boot the server
@ -52,6 +56,7 @@ resources:
mesos-slave:
type: OS::Nova::Server
properties:
name: {get_param: name}
image: {get_param: server_image}
flavor: {get_param: slave_flavor}
key_name: {get_param: ssh_key_name}

View File

@ -353,6 +353,10 @@ resources:
resource_def:
type: swarmmaster.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'master', '%index%']
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}
server_flavor: {get_param: master_flavor}
@ -398,6 +402,10 @@ resources:
resource_def:
type: swarmnode.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'node', '%index%']
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}
server_flavor: {get_param: node_flavor}

View File

@ -6,6 +6,10 @@ description: >
parameters:
name:
type: string
description: server name
ssh_key_name:
type: string
description: name of ssh key to be provisioned on our server
@ -408,6 +412,7 @@ resources:
swarm-master:
type: "OS::Nova::Server"
properties:
name: {get_param: name}
image:
get_param: server_image
flavor:

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
server_image:
type: string
description: glance image used to boot the server
@ -365,6 +369,7 @@ resources:
swarm-node:
type: "OS::Nova::Server"
properties:
name: {get_param: name}
image:
get_param: server_image
flavor:

View File

@ -270,6 +270,10 @@ resources:
resource_def:
type: swarmmaster.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'primary-master', '%index%']
is_primary_master: True
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}
@ -308,6 +312,10 @@ resources:
resource_def:
type: swarmmaster.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'secondary-master', '%index%']
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}
server_flavor: {get_param: master_flavor}
@ -345,6 +353,10 @@ resources:
resource_def:
type: swarmnode.yaml
properties:
name:
list_join:
- '-'
- [{ get_param: 'OS::stack_name' }, 'node', '%index%']
ssh_key_name: {get_param: ssh_key_name}
server_image: {get_param: server_image}
server_flavor: {get_param: node_flavor}

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
ssh_key_name:
type: string
description: name of ssh key to be provisioned on our server
@ -288,6 +292,7 @@ resources:
swarm-master:
type: "OS::Nova::Server"
properties:
name: {get_param: name}
image:
get_param: server_image
flavor:

View File

@ -7,6 +7,10 @@ description: >
parameters:
name:
type: string
description: server name
server_image:
type: string
description: glance image used to boot the server
@ -259,6 +263,7 @@ resources:
swarm-node:
type: "OS::Nova::Server"
properties:
name: {get_param: name}
image:
get_param: server_image
flavor: