Skip to content

Commit e05478d

Browse files
author
Gabriel Monroy
committed
Merge pull request #2029 from carmstrong/coreos_459.0.0
chore(*): bump CoreOS to 459.0.0
2 parents 48afc6f + 29f2b40 commit e05478d

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ else
3535
$vb_cpus = 1
3636
end
3737

38-
COREOS_VERSION = "452.0.0"
38+
COREOS_VERSION = "459.0.0"
3939

4040
if File.exist?(CONFIG)
4141
require CONFIG

contrib/bare-metal/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ coreos-install -C alpha -c /tmp/config -d /dev/sda
4949
```
5050

5151
This will install the current [CoreOS](https://coreos.com/) release to disk. If you want to install the recommended [CoreOS](https://coreos.com/) version check the [Deis changelog](../../CHANGELOG.md)
52-
and specify that version by appending the `-V` parameter to the install command, e.g. `-V 452.0.0`.
52+
and specify that version by appending the `-V` parameter to the install command, e.g. `-V 459.0.0`.
5353

5454
After the installation has finished reboot your server. Once your machine is back up you should be able to log in as the `core` user using the `deis` ssh key.
5555

contrib/ec2/deis.template.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@
8484

8585
"Mappings" : {
8686
"CoreOSAMIs" : {
87-
"us-east-1" : { "PV" : "ami-fc60d494", "HVM" : "ami-fe60d496" },
88-
"us-west-2" : { "PV" : "ami-03de9d33", "HVM" : "ami-01de9d31" },
89-
"us-west-1" : { "PV" : "ami-2b81896e", "HVM" : "ami-2981896c" },
90-
"eu-west-1" : { "PV" : "ami-ee983999", "HVM" : "ami-ec98399b" },
91-
"ap-southeast-1" : { "PV" : "ami-2e486f7c", "HVM" : "ami-2c486f7e" },
92-
"ap-southeast-2" : { "PV" : "ami-ddd4b7e7", "HVM" : "ami-d3d4b7e9" },
93-
"ap-northeast-1" : { "PV" : "ami-9994bd98", "HVM" : "ami-9794bd96" },
94-
"sa-east-1" : { "PV" : "ami-3119b32c", "HVM" : "ami-3319b32e" }
87+
"us-east-1" : { "PV" : "ami-aed360c6", "HVM" : "ami-acd360c4" },
88+
"us-west-2" : { "PV" : "ami-91014ca1", "HVM" : "ami-af014c9f" },
89+
"us-west-1" : { "PV" : "ami-8be5eece", "HVM" : "ami-89e5eecc" },
90+
"eu-west-1" : { "PV" : "ami-62903315", "HVM" : "ami-64903313" },
91+
"ap-southeast-1" : { "PV" : "ami-34b89f66", "HVM" : "ami-3ab89f68" },
92+
"ap-southeast-2" : { "PV" : "ami-01a9cb3b", "HVM" : "ami-07a9cb3d" },
93+
"ap-northeast-1" : { "PV" : "ami-73e4ce72", "HVM" : "ami-75e4ce74" },
94+
"sa-east-1" : { "PV" : "ami-f98237e4", "HVM" : "ami-fb8237e6" }
9595
},
9696
"RootDevices" : {
9797
"HVM" : { "Name": "/dev/xvda" },

contrib/gce/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ Table of resources:
112112
+--------+---------------+--------+---------+
113113
```
114114

115-
Launch 3 instances using `coreos-alpha-444-0-0-v20140919` image. You can choose another starting CoreOS image from the listing output of `gcloud compute images list`:
115+
Launch 3 instances using `coreos-alpha-459-0-0-v20141003` image. You can choose another starting CoreOS image from the listing output of `gcloud compute images list`:
116116

117117
```console
118-
$ for num in 1 2 3; do gcutil addinstance --image projects/coreos-cloud/global/images/coreos-alpha-444-0-0-v20140919 --persistent_boot_disk --zone us-central1-a --machine_type n1-standard-2 --tags deis --metadata_from_file user-data:gce-user-data --disk cored${num},deviceName=coredocker --authorized_ssh_keys=core:~/.ssh/deis.pub,core:~/.ssh/google_compute_engine.pub core${num}; done
118+
$ for num in 1 2 3; do gcutil addinstance --image projects/coreos-cloud/global/images/coreos-alpha-459-0-0-v20141003 --persistent_boot_disk --zone us-central1-a --machine_type n1-standard-2 --tags deis --metadata_from_file user-data:gce-user-data --disk cored${num},deviceName=coredocker --authorized_ssh_keys=core:~/.ssh/deis.pub,core:~/.ssh/google_compute_engine.pub core${num}; done
119119

120120
Table of resources:
121121

controller/scheduler/coreos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def _put_unit(self, name, body):
5454
headers=headers, body=json.dumps(body))
5555
resp = self.conn.getresponse()
5656
data = resp.read()
57-
if resp.status != 204:
57+
if not 200 <= resp.status <= 299:
5858
errmsg = "Failed to create unit: {} {} - {}".format(
5959
resp.status, resp.reason, data)
6060
raise RuntimeError(errmsg)

0 commit comments

Comments
 (0)