cyoi 0.8.3 → 0.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ChangeLog.md +40 -26
- data/cyoi.gemspec +1 -1
- data/lib/cyoi/cli/provider_addresses/address_cli_openstack.rb +1 -1
- data/lib/cyoi/cli/providers/provider_cli_openstack.rb +17 -1
- data/lib/cyoi/providers/clients/fog_provider_client.rb +1 -1
- data/lib/cyoi/version.rb +1 -1
- data/spec/integration/cli/provider/provider_openstack_spec.rb +37 -12
- data/spec/spec_helper.rb +1 -1
- metadata +26 -26
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1de828aa3e54554b6fffcb41a61b43331bddc902
|
4
|
+
data.tar.gz: ac606bf3d290bee5829a44814b88fefa66a1bd0a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1ddb638cb07f86cdc147bd3e94a4ebd43ee88992cb255ca5e3fa25c40ace3275620ad8c4cf6b5032dba2e80c10a2511f56d0267fdae5361da0ed5c531724ec62
|
7
|
+
data.tar.gz: 393b944ddbd50a00ad8185dd76cf6d5e9604e9fe16495f34cc4551de044f52ec3bacea8fd8d2085e78ec7506559533537fce78c59cfe89919dde84b4392be2d0
|
data/ChangeLog.md
CHANGED
@@ -1,46 +1,60 @@
|
|
1
|
-
|
1
|
+
Change Log
|
2
|
+
==========
|
2
3
|
|
3
4
|
Cyoi (choose-your-own-infrastructure) is a library to ask an end-user to choose an infrastructure (AWS, OpenStack, etc), region, and login credentials.
|
4
5
|
|
5
|
-
|
6
|
+
v0.9
|
7
|
+
----
|
6
8
|
|
7
|
-
|
8
|
-
* openstack nova - continues to provision a floating IP
|
9
|
-
* openstack neutron - asks to select a subnet and then an available IP
|
10
|
-
* create_security_group can take a list of ports to open [v0.8.1]
|
11
|
-
* allow for legacy API usage of create_security_group [v0.8.2]
|
12
|
-
* fixed create_security_group support for OpenStack & AWS [v0.8.3]
|
9
|
+
- openstack - prompt for type of image format (qcow2 v raw) and store as provider.options.boot_from_volume
|
13
10
|
|
14
|
-
|
11
|
+
v0.8
|
12
|
+
----
|
15
13
|
|
16
|
-
|
14
|
+
- openstack - detection of nova vs neutron networking
|
15
|
+
- openstack nova - continues to provision a floating IP
|
16
|
+
- openstack neutron - asks to select a subnet and then an available IP
|
17
|
+
- create_security_group can take a list of ports to open [v0.8.1]
|
18
|
+
- allow for legacy API usage of create_security_group [v0.8.2]
|
19
|
+
- fixed create_security_group support for OpenStack & AWS [v0.8.3]
|
17
20
|
|
18
|
-
|
21
|
+
v0.7
|
22
|
+
----
|
19
23
|
|
20
|
-
|
21
|
-
* openstack region doesn't repeatably prompt if set to nothing [v0.6.1]
|
24
|
+
- vsphere provising
|
22
25
|
|
23
|
-
|
26
|
+
v0.6
|
27
|
+
----
|
24
28
|
|
25
|
-
|
26
|
-
|
29
|
+
- added `cyoi image` - AWS: public AMI for Ubuntu 13.04; OpenStack: choose an Image from menu
|
30
|
+
- openstack region doesn't repeatably prompt if set to nothing [v0.6.1]
|
27
31
|
|
28
|
-
|
32
|
+
v0.5
|
33
|
+
----
|
29
34
|
|
30
|
-
|
31
|
-
|
35
|
+
- OpenStack implementation completed by Ferdy!
|
36
|
+
- More status/progress on actions (v0.5.1)
|
32
37
|
|
33
|
-
|
38
|
+
v0.4
|
39
|
+
----
|
34
40
|
|
35
|
-
|
41
|
+
- switch to using readwritesettings instead of fork of settingslogic
|
42
|
+
- clean all highline values before setting (v0.4.1 & v0.4.2)
|
36
43
|
|
37
|
-
|
44
|
+
v0.3
|
45
|
+
----
|
38
46
|
|
39
|
-
|
40
|
-
* added `cyoi address` to prompt or provision an IP address (AWS only at moment)
|
47
|
+
- added `cyoi keypair` & `cyoi key_pair`
|
41
48
|
|
42
|
-
|
49
|
+
v0.2
|
50
|
+
----
|
51
|
+
|
52
|
+
- executable `cyoi` became `cyoi provider`
|
53
|
+
- added `cyoi address` to prompt or provision an IP address (AWS only at moment)
|
54
|
+
|
55
|
+
v0.1
|
56
|
+
----
|
43
57
|
|
44
58
|
Initial release
|
45
59
|
|
46
|
-
|
60
|
+
- executable `cyoi [settings.yml]` - asks for provider information and stores in settings.yml (AWS & OpenStack)
|
data/cyoi.gemspec
CHANGED
@@ -28,7 +28,7 @@ README
|
|
28
28
|
|
29
29
|
spec.add_development_dependency "bundler"
|
30
30
|
spec.add_development_dependency "rake"
|
31
|
-
spec.add_development_dependency "rspec"
|
31
|
+
spec.add_development_dependency "rspec", "~> 2.14"
|
32
32
|
spec.add_development_dependency "rspec-fire"
|
33
33
|
spec.add_development_dependency "aruba"
|
34
34
|
end
|
@@ -4,6 +4,7 @@ class Cyoi::Cli::Providers::ProviderCliOpenStack < Cyoi::Cli::Providers::Provide
|
|
4
4
|
unless valid_infrastructure?
|
5
5
|
puts "\nUsing provider OpenStack\n"
|
6
6
|
setup_credentials
|
7
|
+
setup_options
|
7
8
|
end
|
8
9
|
export_attributes
|
9
10
|
end
|
@@ -22,6 +23,21 @@ class Cyoi::Cli::Providers::ProviderCliOpenStack < Cyoi::Cli::Providers::Provide
|
|
22
23
|
attributes["credentials"] = credentials # need to reassign changed value
|
23
24
|
end
|
24
25
|
|
26
|
+
def setup_options
|
27
|
+
attributes.set_default("options", {})
|
28
|
+
options = attributes.options
|
29
|
+
|
30
|
+
unless options.has_key?("boot_from_volume")
|
31
|
+
image_type = hl.choose do |menu|
|
32
|
+
menu.prompt = "Image format to be used: "
|
33
|
+
menu.choice("QCOW2*") { "qcow2" }
|
34
|
+
menu.choice("RAW") { "raw" }
|
35
|
+
menu.default ="QCOW2*"
|
36
|
+
end
|
37
|
+
options["boot_from_volume"] = (image_type && image_type.to_s == "raw")
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
25
41
|
def valid_infrastructure?
|
26
42
|
attributes.exists?("region") &&
|
27
43
|
attributes.exists?("credentials.openstack_username") &&
|
@@ -41,4 +57,4 @@ class Cyoi::Cli::Providers::ProviderCliOpenStack < Cyoi::Cli::Providers::Provide
|
|
41
57
|
end
|
42
58
|
end
|
43
59
|
|
44
|
-
Cyoi::Cli::Provider.register_provider_cli("openstack", Cyoi::Cli::Providers::ProviderCliOpenStack)
|
60
|
+
Cyoi::Cli::Provider.register_provider_cli("openstack", Cyoi::Cli::Providers::ProviderCliOpenStack)
|
@@ -89,7 +89,7 @@ class Cyoi::Providers::Clients::FogProviderClient
|
|
89
89
|
# * { protocol: "udp", ports: (60000..60050) }
|
90
90
|
# * { protocol: "rdp", ports: (3398..3398), ip_ranges: [ { cidrIp: "196.212.12.34/32" } ] }
|
91
91
|
#
|
92
|
-
# In this example,
|
92
|
+
# In this example,
|
93
93
|
# * TCP 22 will be opened for ssh from any ip_range,
|
94
94
|
# * TCP ports 80, 81, 82 for http from any ip_range,
|
95
95
|
# * UDP 60000 -> 60050 for mosh from any ip_range and
|
data/lib/cyoi/version.rb
CHANGED
@@ -11,6 +11,7 @@ describe "cyoi provider openstack" do
|
|
11
11
|
setting "provider.credentials.openstack_tenant", "TENANT"
|
12
12
|
setting "provider.credentials.openstack_auth_url", "TOKENURL"
|
13
13
|
setting "provider.credentials.openstack_region", "REGION"
|
14
|
+
setting "provider.options.boot_from_volume", false
|
14
15
|
run_interactive(unescape("cyoi provider #{settings_dir}"))
|
15
16
|
assert_passing_with("Confirming: Using OpenStack/REGION (user: USERNAME)")
|
16
17
|
end
|
@@ -23,17 +24,28 @@ describe "cyoi provider openstack" do
|
|
23
24
|
type("TENANT")
|
24
25
|
type("TOKENURL")
|
25
26
|
type("")
|
27
|
+
type("")
|
26
28
|
type("")
|
27
|
-
assert_passing_with(<<-OUT)
|
29
|
+
assert_passing_with(<<-OUT.strip + " \n")
|
28
30
|
1. AWS
|
29
31
|
2. OpenStack
|
30
32
|
3. vSphere
|
31
|
-
Choose your infrastructure:
|
33
|
+
Choose your infrastructure:
|
34
|
+
OUT
|
35
|
+
|
36
|
+
assert_passing_with(<<-OUT.strip)
|
32
37
|
Using provider OpenStack
|
33
|
-
Username: Password: Tenant: Authorization Token URL: OpenStack Region (optional):
|
34
|
-
|
38
|
+
Username: Password: Tenant: Authorization Token URL: OpenStack Region (optional):
|
39
|
+
OUT
|
40
|
+
|
41
|
+
assert_passing_with(<<-OUT.strip + " \n")
|
42
|
+
1. QCOW2*
|
43
|
+
2. RAW
|
44
|
+
Image format to be used:
|
35
45
|
OUT
|
36
46
|
|
47
|
+
assert_passing_with("Confirming: Using OpenStack (user: USERNAME)")
|
48
|
+
|
37
49
|
reload_settings!
|
38
50
|
settings.to_nested_hash.should == {
|
39
51
|
"provider" => {
|
@@ -43,11 +55,12 @@ Confirming: Using OpenStack (user: USERNAME)
|
|
43
55
|
"openstack_tenant"=>"TENANT", "openstack_auth_url"=>"TOKENURL/tokens",
|
44
56
|
"openstack_region"=>""
|
45
57
|
},
|
58
|
+
"options"=>{"boot_from_volume"=>false}
|
46
59
|
}
|
47
60
|
}
|
48
61
|
end
|
49
62
|
|
50
|
-
|
63
|
+
xit "prompts for everything (with region)" do
|
51
64
|
run_interactive(unescape("cyoi provider #{settings_dir}"))
|
52
65
|
type("2")
|
53
66
|
type("USERNAME")
|
@@ -55,19 +68,31 @@ Confirming: Using OpenStack (user: USERNAME)
|
|
55
68
|
type("TENANT")
|
56
69
|
type("TOKENURL")
|
57
70
|
type("REGION")
|
71
|
+
type("") # TODO: BROKEN
|
58
72
|
type("")
|
59
|
-
|
73
|
+
|
74
|
+
assert_passing_with(<<-OUT.strip + " \n")
|
60
75
|
1. AWS
|
61
76
|
2. OpenStack
|
62
77
|
3. vSphere
|
63
|
-
Choose your infrastructure:
|
78
|
+
Choose your infrastructure:
|
79
|
+
OUT
|
80
|
+
|
81
|
+
assert_passing_with(<<-OUT.strip)
|
64
82
|
Using provider OpenStack
|
65
|
-
Username: Password: Tenant: Authorization Token URL: OpenStack Region (optional):
|
66
|
-
Confirming: Using OpenStack/REGION (user: USERNAME)
|
83
|
+
Username: Password: Tenant: Authorization Token URL: OpenStack Region (optional):
|
67
84
|
OUT
|
85
|
+
|
86
|
+
assert_passing_with(<<-OUT.strip + " \n")
|
87
|
+
1. QCOW2*
|
88
|
+
2. RAW
|
89
|
+
Image format to be used:
|
90
|
+
OUT
|
91
|
+
|
92
|
+
assert_passing_with("Confirming: Using OpenStack/REGION (user: USERNAME)")
|
68
93
|
end
|
69
94
|
|
70
|
-
|
95
|
+
xit "auto-detects several openstack options in ~/.fog" do
|
71
96
|
setup_home_dir
|
72
97
|
setup_fog_with_various_accounts_setup
|
73
98
|
run_interactive(unescape("cyoi provider #{settings_dir}"))
|
@@ -81,9 +106,9 @@ Auto-detected infrastructure API credentials at ~/.fog (override with $FOG)
|
|
81
106
|
3. AWS (starkandwayne)
|
82
107
|
4. OpenStack (personal)
|
83
108
|
5. Alternate credentials
|
84
|
-
Choose an auto-detected infrastructure:
|
109
|
+
Choose an auto-detected infrastructure:
|
85
110
|
Using provider OpenStack
|
86
|
-
OpenStack Region (optional):
|
111
|
+
OpenStack Region (optional):
|
87
112
|
Confirming: Using OpenStack (user: USERNAME)
|
88
113
|
OUT
|
89
114
|
end
|
data/spec/spec_helper.rb
CHANGED
metadata
CHANGED
@@ -1,125 +1,125 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cyoi
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.9.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dr Nic Williams
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-06-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fog
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - '>='
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: '0'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - '>='
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '0'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: highline
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- -
|
31
|
+
- - ~>
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: '1.6'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- -
|
38
|
+
- - ~>
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '1.6'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: readwritesettings
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- -
|
45
|
+
- - ~>
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: '3.0'
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- -
|
52
|
+
- - ~>
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '3.0'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: bundler
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- -
|
59
|
+
- - '>='
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: '0'
|
62
62
|
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- -
|
66
|
+
- - '>='
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '0'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rake
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- -
|
73
|
+
- - '>='
|
74
74
|
- !ruby/object:Gem::Version
|
75
75
|
version: '0'
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- -
|
80
|
+
- - '>='
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '0'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: rspec
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- -
|
87
|
+
- - ~>
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: '
|
89
|
+
version: '2.14'
|
90
90
|
type: :development
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
|
-
- -
|
94
|
+
- - ~>
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: '
|
96
|
+
version: '2.14'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: rspec-fire
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- -
|
101
|
+
- - '>='
|
102
102
|
- !ruby/object:Gem::Version
|
103
103
|
version: '0'
|
104
104
|
type: :development
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
|
-
- -
|
108
|
+
- - '>='
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: '0'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: aruba
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
|
-
- -
|
115
|
+
- - '>='
|
116
116
|
- !ruby/object:Gem::Version
|
117
117
|
version: '0'
|
118
118
|
type: :development
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
|
-
- -
|
122
|
+
- - '>='
|
123
123
|
- !ruby/object:Gem::Version
|
124
124
|
version: '0'
|
125
125
|
description: A library to ask an end-user to choose an infrastructure (AWS, OpenStack,
|
@@ -131,9 +131,9 @@ executables:
|
|
131
131
|
extensions: []
|
132
132
|
extra_rdoc_files: []
|
133
133
|
files:
|
134
|
-
-
|
135
|
-
-
|
136
|
-
-
|
134
|
+
- .gitignore
|
135
|
+
- .rspec
|
136
|
+
- .travis.yml
|
137
137
|
- ChangeLog.md
|
138
138
|
- Gemfile
|
139
139
|
- Guardfile
|
@@ -204,17 +204,17 @@ require_paths:
|
|
204
204
|
- lib
|
205
205
|
required_ruby_version: !ruby/object:Gem::Requirement
|
206
206
|
requirements:
|
207
|
-
- -
|
207
|
+
- - '>='
|
208
208
|
- !ruby/object:Gem::Version
|
209
209
|
version: '0'
|
210
210
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
211
211
|
requirements:
|
212
|
-
- -
|
212
|
+
- - '>='
|
213
213
|
- !ruby/object:Gem::Version
|
214
214
|
version: '0'
|
215
215
|
requirements: []
|
216
216
|
rubyforge_project:
|
217
|
-
rubygems_version: 2.2.
|
217
|
+
rubygems_version: 2.2.2
|
218
218
|
signing_key:
|
219
219
|
specification_version: 4
|
220
220
|
summary: A library to ask an end-user to choose an infrastructure (AWS, OpenStack,
|