kitchen-rackspace 0.15.0 → 0.15.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +3 -3
- data/CHANGELOG.md +5 -0
- data/Rakefile +1 -3
- data/data/images.json +26 -15
- data/helpers/dump_image_list.rb +27 -1
- data/lib/kitchen/driver/rackspace_version.rb +1 -1
- data/spec/kitchen/driver/rackspace_spec.rb +1 -0
- data/spec/spec_helper.rb +3 -3
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fc4d175ad8b040d01ac4b092295a4cf39316c892
|
|
4
|
+
data.tar.gz: e8a52bfeecdf540a22e047a50ef20799db101baa
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 275393a9c946967cee14d710a78c5a15b543e48f39e04476717f1a7c8c414c6a91eac5c7356f3f07c8a4ed71099e51019a4750010612d699bdf94e18587f9972
|
|
7
|
+
data.tar.gz: 5b45f5f12153cfbefbbf4017fe96ddf2e9f37abab92a63c6932c83b726d72c12fc96ebe264165691503f4953d1e87e6adda921caa25ecc3acd2aa63027618293
|
data/.travis.yml
CHANGED
data/CHANGELOG.md
CHANGED
data/Rakefile
CHANGED
data/data/images.json
CHANGED
|
@@ -3,23 +3,29 @@
|
|
|
3
3
|
"arch-2015": "ac58054a-9287-4421-89a4-bbcb481258d7",
|
|
4
4
|
"arch-2015.3": "ac58054a-9287-4421-89a4-bbcb481258d7",
|
|
5
5
|
"centos": "0af7334f-c22a-4c24-906b-950b8ef51a86",
|
|
6
|
-
"centos-7": "0af7334f-c22a-4c24-906b-950b8ef51a86",
|
|
7
|
-
"centos-6": "a4a82b28-c5a8-49e3-b31a-db289dcac0f8",
|
|
8
6
|
"centos-5": "922e9afc-ebe4-43e6-8eaf-c555cf7f8cd6",
|
|
7
|
+
"centos-5.11": "922e9afc-ebe4-43e6-8eaf-c555cf7f8cd6",
|
|
8
|
+
"centos-6": "a4a82b28-c5a8-49e3-b31a-db289dcac0f8",
|
|
9
|
+
"centos-6.6": "a4a82b28-c5a8-49e3-b31a-db289dcac0f8",
|
|
10
|
+
"centos-7": "0af7334f-c22a-4c24-906b-950b8ef51a86",
|
|
9
11
|
"coreos": "c412af3b-f9a6-4ad1-a9e9-4aabca8073d3",
|
|
10
|
-
"coreos-
|
|
11
|
-
"coreos-beta": "981f0a5f-5f09-4b71-9372-6aa9fe1a68ac",
|
|
12
|
+
"coreos-0": "981f0a5f-5f09-4b71-9372-6aa9fe1a68ac",
|
|
12
13
|
"coreos-alpha": "378195c3-d10c-43dc-a4a7-661195dab075",
|
|
14
|
+
"coreos-beta": "981f0a5f-5f09-4b71-9372-6aa9fe1a68ac",
|
|
15
|
+
"coreos-stable": "c412af3b-f9a6-4ad1-a9e9-4aabca8073d3",
|
|
13
16
|
"debian": "04399432-ac55-4e0b-bcd1-6c90fa568a0f",
|
|
14
|
-
"debian-7": "04399432-ac55-4e0b-bcd1-6c90fa568a0f",
|
|
15
17
|
"debian-6": "076459d3-6a18-43d4-b8b1-653c2380f8cf",
|
|
18
|
+
"debian-6.10": "076459d3-6a18-43d4-b8b1-653c2380f8cf",
|
|
19
|
+
"debian-7": "04399432-ac55-4e0b-bcd1-6c90fa568a0f",
|
|
20
|
+
"debian-8": "272a02e6-13cf-4d04-b6e5-7d31001d5510",
|
|
16
21
|
"debian-testing": "272a02e6-13cf-4d04-b6e5-7d31001d5510",
|
|
17
22
|
"debian-unstable": "892b9bab-a11e-4d16-b4bd-ab9494ed7b78",
|
|
18
23
|
"fedora": "06c388fd-1906-43e0-93a7-eb1d1c6bb880",
|
|
19
|
-
"fedora-21": "06c388fd-1906-43e0-93a7-eb1d1c6bb880",
|
|
20
24
|
"fedora-20": "dccb6042-43a1-4c02-9b83-786a1cd27751",
|
|
25
|
+
"fedora-21": "06c388fd-1906-43e0-93a7-eb1d1c6bb880",
|
|
21
26
|
"freebsd": "1711732b-dd3f-456d-9a99-6f93b8a6859e",
|
|
22
27
|
"freebsd-10": "1711732b-dd3f-456d-9a99-6f93b8a6859e",
|
|
28
|
+
"freebsd-10.0": "1711732b-dd3f-456d-9a99-6f93b8a6859e",
|
|
23
29
|
"gentoo": "e871e91b-64b9-478e-afaf-b0e3d9fb765a",
|
|
24
30
|
"gentoo-15": "e871e91b-64b9-478e-afaf-b0e3d9fb765a",
|
|
25
31
|
"gentoo-15.1": "e871e91b-64b9-478e-afaf-b0e3d9fb765a",
|
|
@@ -27,26 +33,31 @@
|
|
|
27
33
|
"opensuse-13": "bf7b0aed-1227-439c-9845-2e06078f6e81",
|
|
28
34
|
"opensuse-13.2": "bf7b0aed-1227-439c-9845-2e06078f6e81",
|
|
29
35
|
"redhat": "cecd0198-9e71-42eb-b577-353ed29fbd1c",
|
|
30
|
-
"redhat-7": "cecd0198-9e71-42eb-b577-353ed29fbd1c",
|
|
31
|
-
"redhat-6": "71fec3e5-ffbf-4f03-879c-ece0289bcac6",
|
|
32
36
|
"redhat-5": "fadbb733-931f-409d-bc45-e4b0dd0d252f",
|
|
37
|
+
"redhat-5.11": "fadbb733-931f-409d-bc45-e4b0dd0d252f",
|
|
38
|
+
"redhat-6": "71fec3e5-ffbf-4f03-879c-ece0289bcac6",
|
|
39
|
+
"redhat-6.6": "71fec3e5-ffbf-4f03-879c-ece0289bcac6",
|
|
40
|
+
"redhat-7": "cecd0198-9e71-42eb-b577-353ed29fbd1c",
|
|
33
41
|
"scientific": "76e4ee70-1770-4039-abe4-6fcff38deadc",
|
|
34
|
-
"scientific-7": "76e4ee70-1770-4039-abe4-6fcff38deadc",
|
|
35
42
|
"scientific-6": "a6fd6683-e2ce-4d72-8514-dbb67232cfee",
|
|
43
|
+
"scientific-6.6": "a6fd6683-e2ce-4d72-8514-dbb67232cfee",
|
|
44
|
+
"scientific-7": "76e4ee70-1770-4039-abe4-6fcff38deadc",
|
|
36
45
|
"ubuntu": "b50d9359-3669-4aee-be77-633c8f9386cf",
|
|
37
|
-
"ubuntu-14": "b50d9359-3669-4aee-be77-633c8f9386cf",
|
|
38
|
-
"ubuntu-14.10": "b50d9359-3669-4aee-be77-633c8f9386cf",
|
|
39
|
-
"ubuntu-14.04": "8226139f-3804-4ad6-a461-97ee034b2005",
|
|
40
46
|
"ubuntu-12": "fd1b9e98-21c5-43bb-89d7-bfc4ee3c5caf",
|
|
41
47
|
"ubuntu-12.04": "fd1b9e98-21c5-43bb-89d7-bfc4ee3c5caf",
|
|
48
|
+
"ubuntu-14": "b50d9359-3669-4aee-be77-633c8f9386cf",
|
|
49
|
+
"ubuntu-14.04": "8226139f-3804-4ad6-a461-97ee034b2005",
|
|
50
|
+
"ubuntu-14.10": "b50d9359-3669-4aee-be77-633c8f9386cf",
|
|
42
51
|
"vyatta": "07c16842-db34-449a-90ac-e8f05dd8564e",
|
|
43
52
|
"vyatta-6": "07c16842-db34-449a-90ac-e8f05dd8564e",
|
|
44
53
|
"vyatta-6.7": "07c16842-db34-449a-90ac-e8f05dd8564e",
|
|
45
54
|
"vyatta-6.7R6": "07c16842-db34-449a-90ac-e8f05dd8564e",
|
|
46
55
|
"windows": "7bd254bc-e9d9-4e37-b27e-e94c04fad2f1",
|
|
47
|
-
"windows-2012": "7bd254bc-e9d9-4e37-b27e-e94c04fad2f1",
|
|
48
|
-
"windows-2012R2": "7bd254bc-e9d9-4e37-b27e-e94c04fad2f1",
|
|
49
56
|
"windows-2008": "90aae3ae-6b5a-462f-8c11-66a3f77e7b0b",
|
|
57
|
+
"windows-2008.2": "90aae3ae-6b5a-462f-8c11-66a3f77e7b0b",
|
|
50
58
|
"windows-2008R2": "90aae3ae-6b5a-462f-8c11-66a3f77e7b0b",
|
|
51
|
-
"windows-2008R2SP1": "90aae3ae-6b5a-462f-8c11-66a3f77e7b0b"
|
|
59
|
+
"windows-2008R2SP1": "90aae3ae-6b5a-462f-8c11-66a3f77e7b0b",
|
|
60
|
+
"windows-2012": "7bd254bc-e9d9-4e37-b27e-e94c04fad2f1",
|
|
61
|
+
"windows-2012.2": "7bd254bc-e9d9-4e37-b27e-e94c04fad2f1",
|
|
62
|
+
"windows-2012R2": "7bd254bc-e9d9-4e37-b27e-e94c04fad2f1"
|
|
52
63
|
}
|
data/helpers/dump_image_list.rb
CHANGED
|
@@ -36,6 +36,13 @@ i_care_about = {
|
|
|
36
36
|
windows-2008R2SP1)
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
+
names_to_clean = {
|
|
40
|
+
'com.microsoft.server' => 'windows',
|
|
41
|
+
'org.fedoraproject' => 'fedora',
|
|
42
|
+
'org.archlinux' => 'arch',
|
|
43
|
+
'org.scientificlinux' => 'scientific'
|
|
44
|
+
}
|
|
45
|
+
|
|
39
46
|
compute = Fog::Compute.new(provider: 'Rackspace',
|
|
40
47
|
rackspace_username: ENV['RACKSPACE_USERNAME'],
|
|
41
48
|
rackspace_api_key: ENV['RACKSPACE_API_KEY'],
|
|
@@ -49,6 +56,24 @@ res = aliases.each_with_object({}) do |a, hsh|
|
|
|
49
56
|
end
|
|
50
57
|
|
|
51
58
|
compute.images.select { |i| i_care_about.keys.include?(i.name) }.each do |img|
|
|
59
|
+
image_metadata = img.metadata
|
|
60
|
+
|
|
61
|
+
if image_metadata['org.openstack__1__os_distro'] &&
|
|
62
|
+
image_metadata['org.openstack__1__os_version']
|
|
63
|
+
|
|
64
|
+
distro_id = image_metadata['org.openstack__1__os_distro']
|
|
65
|
+
version = image_metadata['org.openstack__1__os_version']
|
|
66
|
+
|
|
67
|
+
if names_to_clean.include?(distro_id)
|
|
68
|
+
distro = names_to_clean[distro_id]
|
|
69
|
+
else
|
|
70
|
+
distro = distro_id.split('.').last
|
|
71
|
+
end
|
|
72
|
+
|
|
73
|
+
alternate_name = "#{distro}-#{version}"
|
|
74
|
+
res[alternate_name] = img.id
|
|
75
|
+
end
|
|
76
|
+
|
|
52
77
|
i_care_about[img.name].each { |a| res[a] = img.id }
|
|
53
78
|
i_care_about.delete(img.name)
|
|
54
79
|
end
|
|
@@ -57,4 +82,5 @@ unless i_care_about.empty?
|
|
|
57
82
|
fail "Couldn't find some images we expected: #{i_care_about.keys}"
|
|
58
83
|
end
|
|
59
84
|
|
|
60
|
-
|
|
85
|
+
# sort these to make them pretty
|
|
86
|
+
puts JSON.pretty_generate(res.sort.to_h)
|
data/spec/spec_helper.rb
CHANGED