Bump to k8s 1.0.6 & coreos 808.0.0

corekube-openstack.yaml

@@ -30,16 +30,20 @@
  Must be a valid flavor
  coreos_image:
  type: string
- description: Rackspace Cloud Servers CoreOS Alpha (735.0.0)
+ description: Rackspace Cloud Servers CoreOS Stable (808.0.0) UUID
  default: "CoreOS"
  git_command:
  type: string
  description: Git repo checkout command
- default: "/usr/bin/git clone https://github.com/metral/overlord ; /usr/bin/git -C overlord checkout -qf 921619ef475ab16be364c525287a0d54a160cc34"
+ default: "/usr/bin/git clone https://github.com/metral/overlord ; /usr/bin/git -C overlord checkout -qf 1f37433090ec322df4cdde10ebe6ab7b6387dc8b"
  flannel_url:
  type: string
- description: Flannel Binary URL
- default: "http://fe6e6aca3f67c41ad91b-2cf70b2448bc75d5450bec49aeeb0a55.r21.cf1.rackcdn.com/flanneld"
+ description: Flannel (0.5.3) Binary URL
+ default: "http://e0c2ab32810737fd07e4-700417495149341ce4d5f2e85f203802.r26.cf1.rackcdn.com/flanneld"
+ private_discovery_etcd_version:
+ type: string
+ description: Version of etcd used for Private Discovery node
+ default: "2.2.0"
  discovery_net_interface:
  type: string
  description: Host network interface for which the Discovery node will operate over
@@ -202,11 +206,11 @@
  [Service]
  EnvironmentFile=/run/IP
  RestartSec=5s
- ExecStartPre=/usr/bin/docker pull quay.io/coreos/etcd:v2.0.13
+ ExecStartPre=/usr/bin/docker pull quay.io/coreos/etcd:v%private_discovery_etcd_version%
  ExecStart=/usr/bin/docker run -d --name discovery \
  -p 2379:2379 -p 2380:2380 \
  -v /usr/share/ca-certificates/:/etc/ssl/certs \
- --net host quay.io/coreos/etcd:v2.0.13 -name discovery \
+ --net host quay.io/coreos/etcd:v%private_discovery_etcd_version% -name discovery \
  -initial-advertise-peer-urls http://${IP}:2380,http://${IP}:7001 \
  -listen-peer-urls http://${IP}:2380,http://${IP}:7001 \
  -initial-cluster discovery=http://${IP}:2380,discovery=http://${IP}:7001 \
@@ -225,6 +229,7 @@
  params:
  "%wc_notify%": { get_attr: [discovery_wait_handle, curl_cli] }
  "%discovery_net_interface%": { get_param: discovery_net_interface }
+ "%private_discovery_etcd_version%": { get_param: private_discovery_etcd_version}
 
  overlord_wait_handle:
  type: OS::Heat::WaitConditionHandle