bosh_openstack_cpi 1.2792.0 → 1.2797.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/USAGE.md +5 -1
- data/lib/cloud/openstack/cloud.rb +5 -0
- data/lib/cloud/openstack/version.rb +1 -1
- metadata +10 -10
data/USAGE.md
CHANGED
|
@@ -73,6 +73,8 @@ These options are specified under `cloud_properties` in the `resource_pools` sec
|
|
|
73
73
|
which type of instance (OpenStack flavor) the VMs should belong to
|
|
74
74
|
* `availability_zone` (optional)
|
|
75
75
|
the OpenStack availability zone the VMs should be created in
|
|
76
|
+
* `scheduler_hints` (optional)
|
|
77
|
+
[filters](http://docs.openstack.org/developer/nova/devref/filter_scheduler.html) that will be passed to Nova.
|
|
76
78
|
|
|
77
79
|
## Example
|
|
78
80
|
|
|
@@ -120,6 +122,8 @@ This is a sample of how OpenStack specific properties are used in a BOSH deploym
|
|
|
120
122
|
cloud_properties:
|
|
121
123
|
instance_type: m1.small
|
|
122
124
|
availability_zone:
|
|
125
|
+
scheduler_hints:
|
|
126
|
+
group: af09abf2-2283-47d6-f2bd-2932a9ae949c
|
|
123
127
|
|
|
124
128
|
...
|
|
125
129
|
|
|
@@ -132,4 +136,4 @@ This is a sample of how OpenStack specific properties are used in a BOSH deploym
|
|
|
132
136
|
region: RegionOne
|
|
133
137
|
endpoint_type: publicURL
|
|
134
138
|
default_key_name: bosh
|
|
135
|
-
default_security_groups: ["bosh"]
|
|
139
|
+
default_security_groups: ["bosh"]
|
|
@@ -252,12 +252,17 @@ module Bosh::OpenStackCloud
|
|
|
252
252
|
|
|
253
253
|
use_config_drive = !!@openstack_properties.fetch("config_drive", nil)
|
|
254
254
|
|
|
255
|
+
if resource_pool['scheduler_hints']
|
|
256
|
+
@logger.debug("Using scheduler hints: `#{resource_pool['scheduler_hints']}'")
|
|
257
|
+
end
|
|
258
|
+
|
|
255
259
|
server_params = {
|
|
256
260
|
:name => server_name,
|
|
257
261
|
:image_ref => image.id,
|
|
258
262
|
:flavor_ref => flavor.id,
|
|
259
263
|
:key_name => keypair.name,
|
|
260
264
|
:security_groups => security_groups,
|
|
265
|
+
:os_scheduler_hints => resource_pool['scheduler_hints'],
|
|
261
266
|
:nics => nics,
|
|
262
267
|
:config_drive => use_config_drive,
|
|
263
268
|
:user_data => Yajl::Encoder.encode(user_data(server_name, network_spec))
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bosh_openstack_cpi
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.2797.0
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2014-12-
|
|
12
|
+
date: 2014-12-19 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: fog
|
|
@@ -34,7 +34,7 @@ dependencies:
|
|
|
34
34
|
requirements:
|
|
35
35
|
- - ~>
|
|
36
36
|
- !ruby/object:Gem::Version
|
|
37
|
-
version: 1.
|
|
37
|
+
version: 1.2797.0
|
|
38
38
|
type: :runtime
|
|
39
39
|
prerelease: false
|
|
40
40
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -42,7 +42,7 @@ dependencies:
|
|
|
42
42
|
requirements:
|
|
43
43
|
- - ~>
|
|
44
44
|
- !ruby/object:Gem::Version
|
|
45
|
-
version: 1.
|
|
45
|
+
version: 1.2797.0
|
|
46
46
|
- !ruby/object:Gem::Dependency
|
|
47
47
|
name: bosh_cpi
|
|
48
48
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -50,7 +50,7 @@ dependencies:
|
|
|
50
50
|
requirements:
|
|
51
51
|
- - ~>
|
|
52
52
|
- !ruby/object:Gem::Version
|
|
53
|
-
version: 1.
|
|
53
|
+
version: 1.2797.0
|
|
54
54
|
type: :runtime
|
|
55
55
|
prerelease: false
|
|
56
56
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -58,7 +58,7 @@ dependencies:
|
|
|
58
58
|
requirements:
|
|
59
59
|
- - ~>
|
|
60
60
|
- !ruby/object:Gem::Version
|
|
61
|
-
version: 1.
|
|
61
|
+
version: 1.2797.0
|
|
62
62
|
- !ruby/object:Gem::Dependency
|
|
63
63
|
name: bosh-registry
|
|
64
64
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -66,7 +66,7 @@ dependencies:
|
|
|
66
66
|
requirements:
|
|
67
67
|
- - ~>
|
|
68
68
|
- !ruby/object:Gem::Version
|
|
69
|
-
version: 1.
|
|
69
|
+
version: 1.2797.0
|
|
70
70
|
type: :runtime
|
|
71
71
|
prerelease: false
|
|
72
72
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -74,7 +74,7 @@ dependencies:
|
|
|
74
74
|
requirements:
|
|
75
75
|
- - ~>
|
|
76
76
|
- !ruby/object:Gem::Version
|
|
77
|
-
version: 1.
|
|
77
|
+
version: 1.2797.0
|
|
78
78
|
- !ruby/object:Gem::Dependency
|
|
79
79
|
name: httpclient
|
|
80
80
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -125,7 +125,7 @@ dependencies:
|
|
|
125
125
|
version: 1.1.0
|
|
126
126
|
description: ! 'BOSH OpenStack CPI
|
|
127
127
|
|
|
128
|
-
|
|
128
|
+
3fe6aa'
|
|
129
129
|
email: support@cloudfoundry.com
|
|
130
130
|
executables:
|
|
131
131
|
- bosh_openstack_console
|
|
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
171
171
|
version: '0'
|
|
172
172
|
segments:
|
|
173
173
|
- 0
|
|
174
|
-
hash:
|
|
174
|
+
hash: 2072027789388421532
|
|
175
175
|
requirements: []
|
|
176
176
|
rubyforge_project:
|
|
177
177
|
rubygems_version: 1.8.23
|