conan 0.4.11 → 0.4.12

Sign up to get free protection for your applications and to get access to all the features.
@@ -70,5 +70,77 @@
70
70
  "instance-store": "ami-e00b86d0"
71
71
  }
72
72
  }
73
+ },
74
+ "ubuntu 12.04": {
75
+ "ap-northeast-1": {
76
+ "64-bit": {
77
+ "ebs": "ami-7d43cd7c",
78
+ "instance-store": "ami-a547c9a4"
79
+ },
80
+ "32-bit": {
81
+ "ebs": "ami-7b43cd7a",
82
+ "instance-store": "ami-fd4ac4fc"
83
+ }
84
+ },
85
+ "ap-southeast-1": {
86
+ "64-bit": {
87
+ "ebs": "ami-e40846b6",
88
+ "instance-store": "ami-fa0846a8"
89
+ },
90
+ "32-bit": {
91
+ "ebs": "ami-e60846b4",
92
+ "instance-store": "ami-44084616"
93
+ }
94
+ },
95
+ "eu-west-1": {
96
+ "64-bit": {
97
+ "ebs": "ami-7b62730f",
98
+ "instance-store": "ami-7b63720f"
99
+ },
100
+ "32-bit": {
101
+ "ebs": "ami-7962730d",
102
+ "instance-store": "ami-ab6170df"
103
+ }
104
+ },
105
+ "sa-east-1": {
106
+ "64-bit": {
107
+ "ebs": "ami-0c76ac11",
108
+ "instance-store": "ami-e071abfd"
109
+ },
110
+ "32-bit": {
111
+ "ebs": "ami-1076ac0d",
112
+ "instance-store": "ami-ac71abb1"
113
+ }
114
+ },
115
+ "us-east-1": {
116
+ "64-bit": {
117
+ "ebs": "ami-79c0ae10",
118
+ "instance-store": "ami-91c5abf8"
119
+ },
120
+ "32-bit": {
121
+ "ebs": "ami-67c0ae0e",
122
+ "instance-store": "ami-cdc6a8a4"
123
+ }
124
+ },
125
+ "us-west-1": {
126
+ "64-bit": {
127
+ "ebs": "ami-69b59a2c",
128
+ "instance-store": "ami-b5b699f0"
129
+ },
130
+ "32-bit": {
131
+ "ebs": "ami-67c0ae0e",
132
+ "instance-store": "ami-3db69978"
133
+ }
134
+ },
135
+ "us-west-2": {
136
+ "64-bit": {
137
+ "ebs": "ami-773caa47",
138
+ "instance-store": "ami-f33fa9c3"
139
+ },
140
+ "32-bit": {
141
+ "ebs": "ami-753caa45",
142
+ "instance-store": "ami-2b3fa91b"
143
+ }
144
+ }
73
145
  }
74
146
  }
@@ -70,7 +70,8 @@ module AWS
70
70
 
71
71
  defaults = JSON.parse(File.read(File.expand_path(File.join(File.dirname(__FILE__), 'default_amis.json'))))
72
72
 
73
- region_defaults = defaults["ubuntu 10.04"][region]
73
+ #not defaulting to ubuntu 12.04
74
+ region_defaults = defaults["ubuntu 12.04"][region]
74
75
  raise "Invalid Region" if region_defaults.nil?
75
76
  default_ami = region_defaults[arch][root_device_type]
76
77
 
@@ -1,3 +1,3 @@
1
1
  module Conan
2
- VERSION = "0.4.11"
2
+ VERSION = "0.4.12"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: conan
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.11
4
+ version: 0.4.12
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-05-21 00:00:00.000000000 Z
13
+ date: 2013-05-24 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: capistrano