diff --git a/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml index 42d1fbc2fa..99efb03d4a 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/kubecluster.yaml @@ -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} diff --git a/magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml index 8a8ca6e0f5..960a604fa2 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/kubemaster.yaml @@ -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} diff --git a/magnum/drivers/k8s_coreos_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_coreos_v1/templates/kubeminion.yaml index 51296f15f2..cb2f7b09a9 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/kubeminion.yaml @@ -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} diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index 2e988b28c2..47e0a23dc9 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -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} diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml index 32a911a29f..8f681c83f0 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml @@ -7,6 +7,10 @@ description: > parameters: + name: + type: string + description: server name + server_image: type: string description: glance image used to boot the server @@ -510,6 +514,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} diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml index 6093b4da5f..db0ecf3e10 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml @@ -7,6 +7,10 @@ description: > parameters: + name: + type: string + description: server name + server_image: type: string description: glance image used to boot the server @@ -404,6 +408,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} diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml index 1e938cf1a1..3e47a23dd8 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml @@ -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} diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml index ef89b11c60..6e9fe13a93 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubemaster.yaml @@ -7,6 +7,10 @@ description: > parameters: + name: + type: string + description: server name + server_image: type: string description: glance image used to boot the server @@ -466,6 +470,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} diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion.yaml index 9e1f7f2dee..815984867a 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion.yaml @@ -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} diff --git a/magnum/drivers/mesos_ubuntu_v1/templates/mesoscluster.yaml b/magnum/drivers/mesos_ubuntu_v1/templates/mesoscluster.yaml index 7e1d114ffc..514a1a6eb7 100644 --- a/magnum/drivers/mesos_ubuntu_v1/templates/mesoscluster.yaml +++ b/magnum/drivers/mesos_ubuntu_v1/templates/mesoscluster.yaml @@ -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} diff --git a/magnum/drivers/mesos_ubuntu_v1/templates/mesosmaster.yaml b/magnum/drivers/mesos_ubuntu_v1/templates/mesosmaster.yaml index f2d636e3e4..a383b7f0b0 100644 --- a/magnum/drivers/mesos_ubuntu_v1/templates/mesosmaster.yaml +++ b/magnum/drivers/mesos_ubuntu_v1/templates/mesosmaster.yaml @@ -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} diff --git a/magnum/drivers/mesos_ubuntu_v1/templates/mesosslave.yaml b/magnum/drivers/mesos_ubuntu_v1/templates/mesosslave.yaml index 43f1a5e69a..b6aaeacace 100644 --- a/magnum/drivers/mesos_ubuntu_v1/templates/mesosslave.yaml +++ b/magnum/drivers/mesos_ubuntu_v1/templates/mesosslave.yaml @@ -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} diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml index bc1927c178..79813bacc0 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml @@ -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} diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml index c319afb47b..34df287eb8 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml @@ -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 @@ -395,6 +399,7 @@ resources: swarm-master: type: "OS::Nova::Server" properties: + name: {get_param: name} image: get_param: server_image flavor: diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml index 2acdab2bd1..2e12f1378f 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml @@ -7,6 +7,10 @@ description: > parameters: + name: + type: string + description: server name + server_image: type: string description: glance image used to boot the server @@ -352,6 +356,7 @@ resources: swarm-node: type: "OS::Nova::Server" properties: + name: {get_param: name} image: get_param: server_image flavor: diff --git a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmcluster.yaml b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmcluster.yaml index 9ed72768b5..6af9ebe008 100644 --- a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmcluster.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmcluster.yaml @@ -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} diff --git a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml index ecc72bc56c..a9b0e542fb 100644 --- a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml @@ -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: diff --git a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml index 17fc285461..913f1eec7c 100644 --- a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml @@ -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: