Backport multiple template fixes
Includes backport "deafault external_network to "public"" heat-coe-templates: I03c74f2fb47a33820e0bac4947aeaaf096feade3 Includes backport "do not provide default image names" Image naming is not standard enough for us to provide defaults. heat-coe-templates: I67345c3ec807b15101c7248853469c860e0abe8d Includes backport "minor README updates" heat-coe-templates: I01270324a2ee31c8fe4369047806634dbbf1cb01 Change-Id: Idc3e27db85f8d06be82cc1c07c62384a4ee13c84
This commit is contained in:
parent
f114f1a252
commit
54f1f7c89f
|
@ -1,9 +1,8 @@
|
|||
A Kubernetes cluster with Heat
|
||||
==============================
|
||||
|
||||
These [Heat][] templates will deploy an *N*-node [Kubernetes][] cluster,
|
||||
where *N* is the value of the `number_of_minions` parameter you
|
||||
specify when creating the stack.
|
||||
These [Heat][] templates will deploy a [Kubernetes][] cluster that
|
||||
supports automatic scaling based on CPU load.
|
||||
|
||||
[heat]: https://wiki.openstack.org/wiki/Heat
|
||||
[kubernetes]: https://github.com/GoogleCloudPlatform/kubernetes
|
||||
|
@ -17,7 +16,10 @@ pods deployed on different minions.
|
|||
|
||||
### OpenStack
|
||||
|
||||
These templates will work with the Juno version of Heat.
|
||||
These templates will work with the Kilo version of Heat. They *may*
|
||||
work with Juno as well as soon as [#1402894][] is resolved.
|
||||
|
||||
[#1402894]: https://bugs.launchpad.net/heat/+bug/1402894
|
||||
|
||||
### Guest image
|
||||
|
||||
|
@ -47,7 +49,6 @@ And then create the stack, referencing that environment file:
|
|||
You must provide values for:
|
||||
|
||||
- `ssh_key_name`
|
||||
- `external_network`
|
||||
- `server_image`
|
||||
|
||||
## Interacting with Kubernetes
|
||||
|
|
|
@ -14,10 +14,10 @@ parameters:
|
|||
external_network:
|
||||
type: string
|
||||
description: uuid/name of a network to use for floating ip addresses
|
||||
default: public
|
||||
|
||||
server_image:
|
||||
type: string
|
||||
default: centos-atomic
|
||||
description: glance image used to boot the server
|
||||
|
||||
master_flavor:
|
||||
|
|
|
@ -9,7 +9,6 @@ parameters:
|
|||
|
||||
server_image:
|
||||
type: string
|
||||
default: centos-7-atomic-20150120
|
||||
description: glance image used to boot the server
|
||||
|
||||
minion_flavor:
|
||||
|
|
Loading…
Reference in New Issue