cyoi 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 796f3bd2d4a6f62b8eb639192a81813f8b0f1c41
-  data.tar.gz: fcc08b1b8904a375b20d6bec8056e58f48f7849c
+  metadata.gz: f40ad034c190187459af10b580876f6fa0d79fed
+  data.tar.gz: 1d7dbe001b4f2178d0637cbe14b0161e67c9032d
 SHA512:
-  metadata.gz: 19e530d9f342a65a5994057cb5ab17aaa6110c6796cb1d14f1f61ac5174bf24fb06bb1cc4fad05d89d7fa384f39a43778c0e9e09d33f5e1247b7587b953d7c3c
-  data.tar.gz: 6a51fac012a8c0e7c81cde8f03459db1f3da12f987a9a502228a62aa96689def94e6617014e6c6bf1ac4fb5cd4fb62e1c2f528db1c49ab4cdf9ce7906f8f21d1
+  metadata.gz: 0970dc12135136b9b493b883536573851af110f58ea9582ca7820ad04f12d8abaec10b27e6923a9fe2091f4de175bb17c54f0fa0e32a8e864d1e0d3d00a721f7
+  data.tar.gz: 53cbe081b9d407fb26b9987a9a0d6a533da3736fb45c43b7668133cf78e2a35368854dfd72d75b39864b605a7a57733829b766c793a249426ab73a62c02d09a3

data/ChangeLog.md

@@ -5,67 +5,68 @@ Cyoi (choose-your-own-infrastructure) is a library to ask an end-user to choose
 
 v0.11
 
-- AWS VPC support - choose a VPC, choose a subnet, an IP is selected.
+-	AWS VPC support - choose a VPC, choose a subnet, an IP is selected.
+-	AWS - Trusty AMIs if looking for an AMI [v0.11.1]
 
 v0.10
 -----
 
-- `blobstores` - create a bucket/container on AWS/OpenStack
-- `blobstores` - AWS bucket is made publicly readable via bucket policy [v0.10.1]
+-	`blobstores` - create a bucket/container on AWS/OpenStack
+-	`blobstores` - AWS bucket is made publicly readable via bucket policy [v0.10.1]
 
 v0.9
 ----
 
-- openstack - prompt for type of image format (qcow2 v raw) and store as provider.options.boot_from_volume
-- openstack - provides required parent_group_id field when authorizing security group ports [v0.9.2]
+-	openstack - prompt for type of image format (qcow2 v raw) and store as provider.options.boot_from_volume
+-	openstack - provides required parent_group_id field when authorizing security group ports [v0.9.2]
 
 v0.8
 ----
 
-- openstack - detection of nova vs neutron networking
-- openstack nova - continues to provision a floating IP
-- openstack neutron - asks to select a subnet and then an available IP
-- create_security_group can take a list of ports to open [v0.8.1]
-- allow for legacy API usage of create_security_group [v0.8.2]
-- fixed create_security_group support for OpenStack & AWS [v0.8.3]
+-	openstack - detection of nova vs neutron networking
+-	openstack nova - continues to provision a floating IP
+-	openstack neutron - asks to select a subnet and then an available IP
+-	create_security_group can take a list of ports to open [v0.8.1]
+-	allow for legacy API usage of create_security_group [v0.8.2]
+-	fixed create_security_group support for OpenStack & AWS [v0.8.3]
 
 v0.7
 ----
 
-- vsphere provising
+-	vsphere provising
 
 v0.6
 ----
 
-- added `cyoi image` - AWS: public AMI for Ubuntu 13.04; OpenStack: choose an Image from menu
-- openstack region doesn't repeatably prompt if set to nothing [v0.6.1]
+-	added `cyoi image` - AWS: public AMI for Ubuntu 13.04; OpenStack: choose an Image from menu
+-	openstack region doesn't repeatably prompt if set to nothing [v0.6.1]
 
 v0.5
 ----
 
-- OpenStack implementation completed by Ferdy!
-- More status/progress on actions (v0.5.1)
+-	OpenStack implementation completed by Ferdy!
+-	More status/progress on actions (v0.5.1)
 
 v0.4
 ----
 
-- switch to using readwritesettings instead of fork of settingslogic
-- clean all highline values before setting (v0.4.1 & v0.4.2)
+-	switch to using readwritesettings instead of fork of settingslogic
+-	clean all highline values before setting (v0.4.1 & v0.4.2)
 
 v0.3
 ----
 
-- added `cyoi keypair` & `cyoi key_pair`
+-	added `cyoi keypair` & `cyoi key_pair`
 
 v0.2
 ----
 
-- executable `cyoi` became `cyoi provider`
-- added `cyoi address` to prompt or provision an IP address (AWS only at moment)
+-	executable `cyoi` became `cyoi provider`
+-	added `cyoi address` to prompt or provision an IP address (AWS only at moment)
 
 v0.1
 ----
 
 Initial release
 
-- executable `cyoi [settings.yml]` - asks for provider information and stores in settings.yml (AWS & OpenStack)
+-	executable `cyoi [settings.yml]` - asks for provider information and stores in settings.yml (AWS & OpenStack)

data/lib/cyoi/cli/provider_image/image_cli_aws.rb

@@ -2,33 +2,40 @@ require "cyoi/cli/provider_image/image_cli_base"
 class Cyoi::Cli::Image::ImageCliAws < Cyoi::Cli::Image::ImageCliBase
 
   def image_id
-    ubuntu_1304_image_id
+    trusty_image_id
   end
 
-  # Ubuntu 13.04
-  def ubuntu_1304_image_id
+  # Ubuntu 14.04
+  def trusty_image_id(region=nil)
     region = provider_client.attributes.region
     # http://cloud-images.ubuntu.com/locator/ec2/
+    # version: 14.04 LTS
+    # arch: amd64
+    # instance type: ebs-ssd (not hvm)
+    # Using release 20140927
     image_id = case region.to_s
     when "ap-northeast-1"
-      "ami-6b26ab6a"
+      "ami-df4b60de"
     when "ap-southeast-1"
-      "ami-2b511e79"
+      "ami-2ce7c07e"
     when "eu-west-1"
-      "ami-3d160149"
+      "ami-f6b11181"
     when "sa-east-1"
-      "ami-28e43e35"
+      "ami-71d2676c"
     when "us-east-1"
-      "ami-c30360aa"
+      "ami-98aa1cf0"
     when "us-west-1"
-      "ami-d383af96"
+      "ami-736e6536"
+    when "cn-north-1"
+      "ami-e642d0df"
     when "ap-southeast-2"
-      "ami-84a333be"
+      "ami-1f117325"
     when "us-west-2"
-      "ami-bf1d8a8f"
+      "ami-37501207"
     end
-    image_id || raise("Please add Ubuntu 13.04 64bit (EBS) AMI image id to aws.rb#raring_image_id method for region '#{region}'")
+    image_id || raise("Please add Ubuntu 14.04 64bit (EBS SSD) AMI image id to aws.rb#trusty_image_id method for region '#{region}'")
   end
+
 end
 
 Cyoi::Cli::Image.register_image_cli("aws", Cyoi::Cli::Image::ImageCliAws)

data/lib/cyoi/cli/providers/provider_cli_aws.rb

@@ -61,6 +61,7 @@ class Cyoi::Cli::Providers::ProviderCliAws < Cyoi::Cli::Providers::ProviderCli
       { label: "Asia Pacific (Sydney) Region", code: "ap-southeast-2" },
       { label: "Asia Pacific (Tokyo) Region", code: "ap-northeast-1" },
       { label: "South America (Sao Paulo) Region", code: "sa-east-1" },
+      { label: "China (Beijing) Region", code: "cn-north-1" },
     ]
   end
 

data/lib/cyoi/providers/clients/aws_provider_client.rb

@@ -165,33 +165,39 @@ class Cyoi::Providers::Clients::AwsProviderClient < Cyoi::Providers::Clients::Fo
     volume.server = server
   end
 
-  # Ubuntu 13.04
-  def raring_image_id(region=nil)
+  # Ubuntu 14.04
+  def trusty_image_id(region=nil)
     region = fog_compute.region
     # http://cloud-images.ubuntu.com/locator/ec2/
+    # version: 14.04 LTS
+    # arch: amd64
+    # instance type: ebs-ssd (not hvm)
+    # Using release 20140927
     image_id = case region.to_s
     when "ap-northeast-1"
-      "ami-6b26ab6a"
+      "ami-df4b60de"
     when "ap-southeast-1"
-      "ami-2b511e79"
+      "ami-2ce7c07e"
     when "eu-west-1"
-      "ami-3d160149"
+      "ami-f6b11181"
     when "sa-east-1"
-      "ami-28e43e35"
+      "ami-71d2676c"
     when "us-east-1"
-      "ami-c30360aa"
+      "ami-98aa1cf0"
     when "us-west-1"
-      "ami-d383af96"
+      "ami-736e6536"
+    when "cn-north-1"
+      "ami-e642d0df"
     when "ap-southeast-2"
-      "ami-84a333be"
+      "ami-1f117325"
     when "us-west-2"
-      "ami-bf1d8a8f"
+      "ami-37501207"
     end
-    image_id || raise("Please add Ubuntu 13.04 64bit (EBS) AMI image id to aws.rb#raring_image_id method for region '#{region}'")
+    image_id || raise("Please add Ubuntu 14.04 64bit (EBS SSD) AMI image id to aws.rb#trusty_image_id method for region '#{region}'")
   end
 
   def bootstrap(new_attributes = {})
-    new_attributes[:image_id] ||= raring_image_id(fog_compute.region)
+    new_attributes[:image_id] ||= trusty_image_id(fog_compute.region)
     vpc = new_attributes[:subnet_id]
 
     server = fog_compute.servers.new(new_attributes)

data/lib/cyoi/version.rb

@@ -1,3 +1,3 @@
 module Cyoi
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/spec/integration/cli/image/image_aws_spec.rb

@@ -10,6 +10,6 @@ describe "cyoi image aws" do
     setting "provider.credentials.aws_secret_access_key", "aws_secret_access_key"
     setting "provider.region", "us-west-2"
     run_interactive(unescape("cyoi image #{settings_dir}"))
-    assert_passing_with("Confirming: Using image ami-bf1d8a8f")
+    assert_passing_with("Confirming: Using image ami-37501207")
   end
 end

data/spec/unit/cli/image_spec.rb

@@ -28,10 +28,10 @@ describe "cyoi" do
       settings.image.image_id.should == "ami-123456"
     end
 
-    it "auto-selects Ubuntu 13.04 image in region" do
+    it "auto-selects Ubuntu 14.04 image in region" do
       capture_stdout { subject.execute! }
       reload_settings!
-      settings.image.image_id.should == "ami-bf1d8a8f"
+      settings.image.image_id.should == "ami-37501207"
     end
   end
 
@@ -63,4 +63,4 @@ describe "cyoi" do
       settings.image.image_id.should == "chosen-image-id"
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyoi
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog