Skip to content

Commit 194a347

Browse files
mboersmamboersma
committed
Merge pull request #2613 from mboersma/coreos-beta
feat(*): provision using CoreOS beta channel
2 parents 658d944 + f729303 commit 194a347

5 files changed

Lines changed: 25 additions & 30 deletions

File tree

‎Vagrantfile‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CONFIG = File.join(File.dirname(__FILE__), "config.rb")
1010

1111
# Defaults for config options defined in CONFIG
1212
$num_instances = 1
13-
$update_channel = "alpha"
13+
$update_channel = "beta"
1414
$enable_serial_logging = false
1515
$vb_gui = false
1616
$vb_memory = 1024
@@ -35,30 +35,25 @@ else
3535
$vb_cpus = 1
3636
end
3737

38-
COREOS_VERSION = "509.1.0"
39-
4038
if File.exist?(CONFIG)
4139
require CONFIG
4240
end
4341

4442
Vagrant.configure("2") do |config|
45-
# config.vm.box = "coreos-%s" % $update_channel
46-
# config.vm.box_version = ">= 308.0.1"
47-
# config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
48-
config.vm.box = "coreos-#{COREOS_VERSION}"
49-
config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/#{COREOS_VERSION}/coreos_production_vagrant.box"
50-
51-
config.vm.provider :vmware_fusion do |vb, override|
52-
# override.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json" % $update_channel
53-
override.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/#{COREOS_VERSION}/coreos_production_vagrant_vmware_fusion.box"
54-
end
43+
config.vm.box = "coreos-%s" % $update_channel
44+
config.vm.box_version = ">= 494.1.0"
45+
config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
5546

5647
config.vm.provider :virtualbox do |vb, override|
5748
# Use paravirtualized network adapters
5849
vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
5950
vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
6051
end
6152

53+
config.vm.provider :vmware_fusion do |vb, override|
54+
override.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json" % $update_channel
55+
end
56+
6257
config.vm.provider :virtualbox do |v|
6358
# On VirtualBox, we don't have guest additions or a functional vboxsf
6459
# in CoreOS, so tell Vagrant that so it can be smarter.

‎contrib/ec2/deis.template.json‎

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

8585
"Mappings" : {
8686
"CoreOSAMIs" : {
87-
"eu-central-1" : { "PV" : "ami-9623128b", "HVM" : "ami-94231289" },
88-
"ap-northeast-1" : { "PV" : "ami-d6999dd7", "HVM" : "ami-d8999dd9" },
89-
"sa-east-1" : { "PV" : "ami-79a41564", "HVM" : "ami-7fa41562" },
90-
"ap-southeast-2" : { "PV" : "ami-e1dfb1db", "HVM" : "ami-e3dfb1d9" },
91-
"ap-southeast-1" : { "PV" : "ami-7598ba27", "HVM" : "ami-7b98ba29" },
92-
"us-east-1" : { "PV" : "ami-00158768", "HVM" : "ami-0215876a" },
93-
"us-west-2" : { "PV" : "ami-d92377e9", "HVM" : "ami-d72377e7" },
94-
"us-west-1" : { "PV" : "ami-a7adbce2", "HVM" : "ami-a5adbce0" },
95-
"eu-west-1" : { "PV" : "ami-c6e858b1", "HVM" : "ami-d8e858af" }
87+
"eu-central-1" : { "PV" : "ami-5e221343", "HVM" : "ami-58221345" },
88+
"ap-northeast-1" : { "PV" : "ami-96a0a497", "HVM" : "ami-94a0a495" },
89+
"sa-east-1" : { "PV" : "ami-31a9182c", "HVM" : "ami-37a9182a" },
90+
"ap-southeast-2" : { "PV" : "ami-89dab4b3", "HVM" : "ami-8fdab4b5" },
91+
"ap-southeast-1" : { "PV" : "ami-879ebcd5", "HVM" : "ami-859ebcd7" },
92+
"us-east-1" : { "PV" : "ami-4a0a9822", "HVM" : "ami-4c0a9824" },
93+
"us-west-2" : { "PV" : "ami-ff2a7ecf", "HVM" : "ami-fd2a7ecd" },
94+
"us-west-1" : { "PV" : "ami-a7aebfe2", "HVM" : "ami-a1aebfe4" },
95+
"eu-west-1" : { "PV" : "ami-acd363db", "HVM" : "ami-aad363dd" }
9696

9797
},
9898
"RootDevices" : {

‎contrib/rackspace/provision-rackspace-cluster.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ $CONTRIB_DIR/util/check-user-data.sh
4848

4949
i=1 ; while [[ $i -le $DEIS_NUM_INSTANCES ]] ; do \
5050
echo_yellow "Provisioning deis-$i..."
51-
# TODO: update to CoreOS 509.1.0 when it is available at Rackspace
52-
# This image is CoreOS 494.0.0
51+
# TODO: update to CoreOS 494.1.0 when it is available in beta channel at Rackspace
52+
# This image is CoreOS 494.0.0 in their alpha channel
5353
supernova $ENV boot --image 1c423602-ea76-4263-b56b-0a2fa3e8c663 --flavor $FLAVOR --key-name $1 --user-data ../coreos/user-data --no-service-net --nic net-id=$NETWORK_ID --config-drive true deis-$i ; \
5454
((i = i + 1)) ; \
5555
done

‎docs/installing_deis/baremetal.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ machine running entirely from RAM. Then, you can `install CoreOS to disk`_.
1616

1717
.. important::
1818

19-
Deis requires CoreOS version 472.0.0 or more recent.
19+
Deis requires CoreOS version 494.1.0 or more recent.
2020

2121

2222
Check System Requirements
@@ -95,12 +95,12 @@ Start the installation
9595

9696
.. code-block:: console
9797
98-
coreos-install -C alpha -c /tmp/config -d /dev/sda
98+
coreos-install -C beta -c /tmp/config -d /dev/sda
9999
100100
101-
This will install the latest `CoreOS`_ alpha release to disk. The Deis provision scripts for other
102-
platforms typically specify a CoreOS version - currently, ``509.1.0``. To specify a specific CoreOS
103-
version, append the ``-V`` parameter to the install command, e.g. ``-V 509.1.0``.
101+
This will install the latest `CoreOS`_ beta release to disk. The Deis provision scripts for other
102+
platforms typically specify a CoreOS version - currently, ``494.1.0``. To specify a CoreOS
103+
version, append the ``-V`` parameter to the install command, e.g. ``-V 494.1.0``.
104104

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

‎docs/installing_deis/gce.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Launch 3 instances. You can choose another starting CoreOS image from the listin
119119

120120
.. code-block:: console
121121
122-
$ for num in 1 2 3; do gcutil addinstance --image projects/coreos-cloud/global/images/coreos-alpha-509-1-0-v20141124 --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
122+
$ for num in 1 2 3; do gcutil addinstance --image projects/coreos-cloud/global/images/coreos-beta-494-1-0-v20141124 --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
123123
124124
Table of resources:
125125

0 commit comments

Comments
 (0)