Merge "Remove underscores from Nova server names"
This commit is contained in:
commit
1cf8a5f422
@ -157,7 +157,7 @@ resources:
|
|||||||
|
|
||||||
master_wait_condition:
|
master_wait_condition:
|
||||||
type: OS::Heat::WaitCondition
|
type: OS::Heat::WaitCondition
|
||||||
depends_on: kube_master
|
depends_on: kube-master
|
||||||
properties:
|
properties:
|
||||||
handle: {get_resource: master_wait_handle}
|
handle: {get_resource: master_wait_handle}
|
||||||
timeout: {get_param: wait_condition_timeout}
|
timeout: {get_param: wait_condition_timeout}
|
||||||
@ -364,7 +364,10 @@ resources:
|
|||||||
# a single kubernetes master.
|
# a single kubernetes master.
|
||||||
#
|
#
|
||||||
|
|
||||||
kube_master:
|
# do NOT use "_" (underscore) in the Nova server name
|
||||||
|
# it creates a mismatch between the generated Nova name and its hostname
|
||||||
|
# which can lead to weird problems
|
||||||
|
kube-master:
|
||||||
type: OS::Nova::Server
|
type: OS::Nova::Server
|
||||||
properties:
|
properties:
|
||||||
image: {get_param: server_image}
|
image: {get_param: server_image}
|
||||||
|
@ -246,13 +246,9 @@ resources:
|
|||||||
"$enable_kube_proxy": {get_attr: [enable_kube_proxy, config]}
|
"$enable_kube_proxy": {get_attr: [enable_kube_proxy, config]}
|
||||||
"$wc_notify": {get_attr: [wc_notify, config]}
|
"$wc_notify": {get_attr: [wc_notify, config]}
|
||||||
|
|
||||||
# Important: the name for the heat resource kube-minion below must
|
# do NOT use "_" (underscore) in the Nova server name
|
||||||
# not contain "_" (underscore) because it will be used in the
|
# it creates a mismatch between the generated Nova name and its hostname
|
||||||
# hostname. Because DNS domain name does not allow "_", the "_"
|
# which can lead to weird problems
|
||||||
# will be converted to a "-" and this will make the hostname different
|
|
||||||
# from the Nova instance name. This in turn will break the load
|
|
||||||
# balancer feature in Kubernetes.
|
|
||||||
|
|
||||||
kube-minion:
|
kube-minion:
|
||||||
type: OS::Nova::Server
|
type: OS::Nova::Server
|
||||||
properties:
|
properties:
|
||||||
|
@ -186,7 +186,7 @@ resources:
|
|||||||
|
|
||||||
master_wait_condition:
|
master_wait_condition:
|
||||||
type: OS::Heat::WaitCondition
|
type: OS::Heat::WaitCondition
|
||||||
depends_on: kube_master
|
depends_on: kube-master
|
||||||
properties:
|
properties:
|
||||||
handle: {get_resource: master_wait_handle}
|
handle: {get_resource: master_wait_handle}
|
||||||
timeout: {get_param: wait_condition_timeout}
|
timeout: {get_param: wait_condition_timeout}
|
||||||
@ -386,7 +386,10 @@ resources:
|
|||||||
# a single kubernetes master.
|
# a single kubernetes master.
|
||||||
#
|
#
|
||||||
|
|
||||||
kube_master:
|
# do NOT use "_" (underscore) in the Nova server name
|
||||||
|
# it creates a mismatch between the generated Nova name and its hostname
|
||||||
|
# which can lead to weird problems
|
||||||
|
kube-master:
|
||||||
type: OS::Nova::Server
|
type: OS::Nova::Server
|
||||||
properties:
|
properties:
|
||||||
image: {get_param: server_image}
|
image: {get_param: server_image}
|
||||||
@ -445,7 +448,7 @@ resources:
|
|||||||
docker_volume_attach:
|
docker_volume_attach:
|
||||||
type: Magnum::Optional::Cinder::VolumeAttachment
|
type: Magnum::Optional::Cinder::VolumeAttachment
|
||||||
properties:
|
properties:
|
||||||
instance_uuid: {get_resource: kube_master}
|
instance_uuid: {get_resource: kube-master}
|
||||||
volume_id: {get_resource: docker_volume}
|
volume_id: {get_resource: docker_volume}
|
||||||
mountpoint: /dev/vdb
|
mountpoint: /dev/vdb
|
||||||
|
|
||||||
|
@ -367,14 +367,11 @@ resources:
|
|||||||
######################################################################
|
######################################################################
|
||||||
#
|
#
|
||||||
# a single kubernetes minion.
|
# a single kubernetes minion.
|
||||||
# Important: the name for the heat resource kube-minion below must
|
|
||||||
# not contain "_" (underscore) because it will be used in the
|
|
||||||
# hostname. Because DNS domain name does not allow "_", the "_"
|
|
||||||
# will be converted to a "-" and this will make the hostname different
|
|
||||||
# from the Nova instance name. This in turn will break the load
|
|
||||||
# balancer feature in Kubernetes.
|
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# do NOT use "_" (underscore) in the Nova server name
|
||||||
|
# it creates a mismatch between the generated Nova name and its hostname
|
||||||
|
# which can lead to weird problems
|
||||||
kube-minion:
|
kube-minion:
|
||||||
type: OS::Nova::Server
|
type: OS::Nova::Server
|
||||||
properties:
|
properties:
|
||||||
|
@ -190,7 +190,7 @@ resources:
|
|||||||
|
|
||||||
master_wait_condition:
|
master_wait_condition:
|
||||||
type: OS::Heat::WaitCondition
|
type: OS::Heat::WaitCondition
|
||||||
depends_on: kube_master
|
depends_on: kube-master
|
||||||
properties:
|
properties:
|
||||||
handle: {get_resource: master_wait_handle}
|
handle: {get_resource: master_wait_handle}
|
||||||
timeout: {get_param: wait_condition_timeout}
|
timeout: {get_param: wait_condition_timeout}
|
||||||
@ -389,7 +389,10 @@ resources:
|
|||||||
# a single kubernetes master.
|
# a single kubernetes master.
|
||||||
#
|
#
|
||||||
|
|
||||||
kube_master:
|
# do NOT use "_" (underscore) in the Nova server name
|
||||||
|
# it creates a mismatch between the generated Nova name and its hostname
|
||||||
|
# which can lead to weird problems
|
||||||
|
kube-master:
|
||||||
type: OS::Nova::Server
|
type: OS::Nova::Server
|
||||||
properties:
|
properties:
|
||||||
image: {get_param: server_image}
|
image: {get_param: server_image}
|
||||||
@ -406,13 +409,13 @@ resources:
|
|||||||
floating_network:
|
floating_network:
|
||||||
get_param: external_network
|
get_param: external_network
|
||||||
port_id:
|
port_id:
|
||||||
get_attr: [kube_master, addresses, {get_param: fixed_network}, 0, port]
|
get_attr: [kube-master, addresses, {get_param: fixed_network}, 0, port]
|
||||||
|
|
||||||
api_pool_member:
|
api_pool_member:
|
||||||
type: Magnum::Optional::Neutron::LBaaS::PoolMember
|
type: Magnum::Optional::Neutron::LBaaS::PoolMember
|
||||||
properties:
|
properties:
|
||||||
pool: {get_param: api_pool_id}
|
pool: {get_param: api_pool_id}
|
||||||
address: {get_attr: [kube_master, networks, private, 0]}
|
address: {get_attr: [kube-master, networks, private, 0]}
|
||||||
subnet: { get_param: fixed_subnet }
|
subnet: { get_param: fixed_subnet }
|
||||||
protocol_port: {get_param: kubernetes_port}
|
protocol_port: {get_param: kubernetes_port}
|
||||||
|
|
||||||
@ -420,14 +423,14 @@ resources:
|
|||||||
type: Magnum::Optional::Neutron::LBaaS::PoolMember
|
type: Magnum::Optional::Neutron::LBaaS::PoolMember
|
||||||
properties:
|
properties:
|
||||||
pool: {get_param: etcd_pool_id}
|
pool: {get_param: etcd_pool_id}
|
||||||
address: {get_attr: [kube_master, networks, private, 0]}
|
address: {get_attr: [kube-master, networks, private, 0]}
|
||||||
subnet: { get_param: fixed_subnet }
|
subnet: { get_param: fixed_subnet }
|
||||||
protocol_port: 2379
|
protocol_port: 2379
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
|
|
||||||
kube_master_ip:
|
kube_master_ip:
|
||||||
value: {get_attr: [kube_master, networks, private, 0]}
|
value: {get_attr: [kube-master, networks, private, 0]}
|
||||||
description: >
|
description: >
|
||||||
This is the "private" IP address of the Kubernetes master node.
|
This is the "private" IP address of the Kubernetes master node.
|
||||||
|
|
||||||
|
@ -366,14 +366,11 @@ resources:
|
|||||||
######################################################################
|
######################################################################
|
||||||
#
|
#
|
||||||
# a single kubernetes minion.
|
# a single kubernetes minion.
|
||||||
# Important: the name for the heat resource kube-minion below must
|
|
||||||
# not contain "_" (underscore) because it will be used in the
|
|
||||||
# hostname. Because DNS domain name does not allow "_", the "_"
|
|
||||||
# will be converted to a "-" and this will make the hostname different
|
|
||||||
# from the Nova instance name. This in turn will break the load
|
|
||||||
# balancer feature in Kubernetes.
|
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# do NOT use "_" (underscore) in the Nova server name
|
||||||
|
# it creates a mismatch between the generated Nova name and its hostname
|
||||||
|
# which can lead to weird problems
|
||||||
kube-minion:
|
kube-minion:
|
||||||
type: OS::Nova::Server
|
type: OS::Nova::Server
|
||||||
properties:
|
properties:
|
||||||
|
@ -50,7 +50,10 @@ resources:
|
|||||||
# Mesos master server.
|
# Mesos master server.
|
||||||
#
|
#
|
||||||
|
|
||||||
mesos_master:
|
# do NOT use "_" (underscore) in the Nova server name
|
||||||
|
# it creates a mismatch between the generated Nova name and its hostname
|
||||||
|
# which can lead to weird problems
|
||||||
|
mesos-master:
|
||||||
type: OS::Nova::Server
|
type: OS::Nova::Server
|
||||||
properties:
|
properties:
|
||||||
image: {get_param: server_image}
|
image: {get_param: server_image}
|
||||||
@ -96,6 +99,6 @@ outputs:
|
|||||||
description: >
|
description: >
|
||||||
This is the "public" address of the Mesos master node.
|
This is the "public" address of the Mesos master node.
|
||||||
mesos_server_id:
|
mesos_server_id:
|
||||||
value: {get_resource: mesos_master}
|
value: {get_resource: mesos-master}
|
||||||
description: >
|
description: >
|
||||||
This is the logical id of the Mesos master node.
|
This is the logical id of the Mesos master node.
|
||||||
|
@ -138,7 +138,7 @@ resources:
|
|||||||
|
|
||||||
slave_wait_condition:
|
slave_wait_condition:
|
||||||
type: OS::Heat::WaitCondition
|
type: OS::Heat::WaitCondition
|
||||||
depends_on: mesos_slave
|
depends_on: mesos-slave
|
||||||
properties:
|
properties:
|
||||||
handle: {get_resource: slave_wait_handle}
|
handle: {get_resource: slave_wait_handle}
|
||||||
timeout: {get_param: wait_condition_timeout}
|
timeout: {get_param: wait_condition_timeout}
|
||||||
@ -235,7 +235,10 @@ resources:
|
|||||||
# a single Mesos slave.
|
# a single Mesos slave.
|
||||||
#
|
#
|
||||||
|
|
||||||
mesos_slave:
|
# do NOT use "_" (underscore) in the Nova server name
|
||||||
|
# it creates a mismatch between the generated Nova name and its hostname
|
||||||
|
# which can lead to weird problems
|
||||||
|
mesos-slave:
|
||||||
type: OS::Nova::Server
|
type: OS::Nova::Server
|
||||||
properties:
|
properties:
|
||||||
image: {get_param: server_image}
|
image: {get_param: server_image}
|
||||||
|
@ -169,7 +169,7 @@ resources:
|
|||||||
|
|
||||||
master_wait_condition:
|
master_wait_condition:
|
||||||
type: "OS::Heat::WaitCondition"
|
type: "OS::Heat::WaitCondition"
|
||||||
depends_on: swarm_master
|
depends_on: swarm-master
|
||||||
properties:
|
properties:
|
||||||
handle: {get_resource: master_wait_handle}
|
handle: {get_resource: master_wait_handle}
|
||||||
timeout: 6000
|
timeout: 6000
|
||||||
@ -387,7 +387,10 @@ resources:
|
|||||||
# side the swarm agent.
|
# side the swarm agent.
|
||||||
#
|
#
|
||||||
|
|
||||||
swarm_master:
|
# do NOT use "_" (underscore) in the Nova server name
|
||||||
|
# it creates a mismatch between the generated Nova name and its hostname
|
||||||
|
# which can lead to weird problems
|
||||||
|
swarm-master:
|
||||||
type: "OS::Nova::Server"
|
type: "OS::Nova::Server"
|
||||||
properties:
|
properties:
|
||||||
image:
|
image:
|
||||||
@ -453,7 +456,7 @@ resources:
|
|||||||
docker_volume_attach:
|
docker_volume_attach:
|
||||||
type: Magnum::Optional::Cinder::VolumeAttachment
|
type: Magnum::Optional::Cinder::VolumeAttachment
|
||||||
properties:
|
properties:
|
||||||
instance_uuid: {get_resource: swarm_master}
|
instance_uuid: {get_resource: swarm-master}
|
||||||
volume_id: {get_resource: docker_volume}
|
volume_id: {get_resource: docker_volume}
|
||||||
mountpoint: /dev/vdb
|
mountpoint: /dev/vdb
|
||||||
|
|
||||||
|
@ -168,7 +168,7 @@ resources:
|
|||||||
|
|
||||||
node_wait_condition:
|
node_wait_condition:
|
||||||
type: "OS::Heat::WaitCondition"
|
type: "OS::Heat::WaitCondition"
|
||||||
depends_on: swarm_node
|
depends_on: swarm-node
|
||||||
properties:
|
properties:
|
||||||
handle: {get_resource: node_wait_handle}
|
handle: {get_resource: node_wait_handle}
|
||||||
timeout: 6000
|
timeout: 6000
|
||||||
@ -343,7 +343,10 @@ resources:
|
|||||||
- config: {get_resource: cfn_signal}
|
- config: {get_resource: cfn_signal}
|
||||||
- config: {get_resource: volume_service}
|
- config: {get_resource: volume_service}
|
||||||
|
|
||||||
swarm_node:
|
# do NOT use "_" (underscore) in the Nova server name
|
||||||
|
# it creates a mismatch between the generated Nova name and its hostname
|
||||||
|
# which can lead to weird problems
|
||||||
|
swarm-node:
|
||||||
type: "OS::Nova::Server"
|
type: "OS::Nova::Server"
|
||||||
properties:
|
properties:
|
||||||
image:
|
image:
|
||||||
@ -393,7 +396,7 @@ resources:
|
|||||||
docker_volume_attach:
|
docker_volume_attach:
|
||||||
type: Magnum::Optional::Cinder::VolumeAttachment
|
type: Magnum::Optional::Cinder::VolumeAttachment
|
||||||
properties:
|
properties:
|
||||||
instance_uuid: {get_resource: swarm_node}
|
instance_uuid: {get_resource: swarm-node}
|
||||||
volume_id: {get_resource: docker_volume}
|
volume_id: {get_resource: docker_volume}
|
||||||
mountpoint: /dev/vdb
|
mountpoint: /dev/vdb
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user