fog-openstack 0.1.8 → 0.1.9

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d9ce654512cff2b2a3f28e0824d064b301545033
4
- data.tar.gz: a77a6c8e6ae3407c2ca6cb0cda7778475937dfb4
3
+ metadata.gz: bdbf12ad9b46bc13d3bbea77d69676b06d29a3d2
4
+ data.tar.gz: 5f71faf886da920a9703b1baee798aeac24ac412
5
5
  SHA512:
6
- metadata.gz: a854f60f8714a51c8e8942c4186bcc9c8a5e2964bba44f566486965f5d9b31da92ccb11598722421c39069b88bace1ddf8f0a3425f3d568f8b794cadc4736557
7
- data.tar.gz: 93d5e4dd2500f120a2458c658e125d0a2bd79f461ffab55ff62fed458cd5032d2f7ebe8b2f8c933bc631457a94f8d7d7f8b66261e9a8c22ddfa2e690b3048a31
6
+ metadata.gz: 1aed7613af33f4670f62e378e570c81dc3cdb03192715180f0a181f31eace57b7fed8d8452dd31a66cf0e7c690df1b48a12732b25f7c7e291062e3b13f780c8d
7
+ data.tar.gz: f4b581e2c3d3d1b9994eda1c0a6adca2ea84dd13378e141e57a4cc876f338c18892b9a69fcdd4c1fc926e70864c73265d632bdc98d3bfd54c6fe951c3ca5671d
@@ -15,7 +15,7 @@ module Fog
15
15
  cached_alarm = detect { |alarm| alarm.id == id }
16
16
  return cached_alarm if cached_alarm
17
17
  alarm_hash = service.get_alarm(id).body
18
- Fog::Identity::OpenStack::Alarm.new(
18
+ Fog::Monitoring::OpenStack::Alarm.new(
19
19
  alarm_hash.merge(:service => service)
20
20
  )
21
21
  end
@@ -105,13 +105,14 @@ module Fog
105
105
  template
106
106
  end
107
107
 
108
- {
108
+ options = {
109
109
  :stack_name => stack_name,
110
110
  :disable_rollback => disable_rollback,
111
- :template_url => @template_url,
112
- :template => template_content,
113
111
  :timeout_mins => timeout_mins
114
112
  }
113
+ options[:template] = template_content if template_content
114
+ options[:template_url] = @template_url if @template_url
115
+ options
115
116
  end
116
117
  private :default_options
117
118
  end
@@ -28,7 +28,7 @@ module Fog
28
28
  end
29
29
 
30
30
  new(data)
31
- rescue Fog::Compute::OpenStack::NotFound
31
+ rescue Fog::Orchestration::OpenStack::NotFound
32
32
  nil
33
33
  end
34
34
 
@@ -131,10 +131,9 @@ module Fog
131
131
  class Real
132
132
  include Fog::OpenStack::Core
133
133
 
134
- # NOTE: uncommenting this should be treated as api-change!
135
- # def self.not_found_class
136
- # Fog::Orchestration::OpenStack::NotFound
137
- # end
134
+ def self.not_found_class
135
+ Fog::Orchestration::OpenStack::NotFound
136
+ end
138
137
 
139
138
  def initialize(options={})
140
139
  initialize_identity options
@@ -2,12 +2,11 @@ module Fog
2
2
  module Monitoring
3
3
  class OpenStack
4
4
  class Real
5
- def get_alarm(options = {})
5
+ def get_alarm(id)
6
6
  request(
7
7
  :expects => [200],
8
8
  :method => 'GET',
9
- :path => "alarms/#{id}",
10
- :query => options
9
+ :path => "alarms/#{id}"
11
10
  )
12
11
  end
13
12
  end
@@ -1,5 +1,5 @@
1
1
  module Fog
2
2
  module Openstack
3
- VERSION = "0.1.8"
3
+ VERSION = "0.1.9"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fog-openstack
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8
4
+ version: 0.1.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Darby
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-07-14 00:00:00.000000000 Z
11
+ date: 2016-07-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fog-core