egon 0.4.5 → 0.4.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzBlNWIyYmVjOGY3YWQ0NWJjZTY4OTVlZDg0MjBlYzE5ODU0MTU4Mw==
+    YzdhZDA5ZDEyMTU3OTg5MzUyMDI2MTVmNTRmZjkyNzkzYzMxZWJlYw==
   data.tar.gz: !binary |-
-    NTUxNTViMTM2MjlkNDJiN2M3Zjc4MWY4YWFhMTc0YjExNDYzZWE5OA==
+    OTNlNGJlNjI0NmMzMmQ2NjFiY2E1YjhjMDc4Mjk4NmE5OTg5N2IzNg==
 SHA512:
   metadata.gz: !binary |-
-    NDRmZTA4YzhmNWFhZjhjNGE5OGNlZWEzNzcxYjdlZGM4YzlhYWJmMDM0MWY0
-    MjI1MWI0MWEzODRiMDQ2ZTk0NTFhYWY2Y2U1M2FmZDBmNDk1N2Q0YzJmY2I4
-    ZGFjZTNlZGVhOTA1NWEzMGRlNjUxZmU5YWQ3MWZiZDIxODljYjE=
+    YjQxZjIxYmNmMzNjMWEzMzI0MTYzYmJlMGM0MTMyM2ExMGM1ZmRhYmUxYTVl
+    Mzk1MzhiMjU4MTU1MTg0ZWQyMjAxMjU2ZDFkNGQ4ZjBhY2Y2Y2MwNTZjYzRm
+    MWNmYjg2N2ZlZGQzZjU4ZTZiZjQ1ZGVjNmFiYjg0ZWExMTYwMWM=
   data.tar.gz: !binary |-
-    MDBlZGNlNGQ2MGQyNDBmYzE3NWM2NzliNjFmNDQyYjNmMzQ0Zjk2YTBmMzFl
-    OWZkYzAxNGY1MmNkMTE5YjJmNDE3MzNmMWI0ZTFhNmVkZmI1MGVkZjE2OTUz
-    NDEyNjhiNzI0NGNkNDI4ZDUyNmUyN2I3ZDVhZDE4MDAzMWUyNmE=
+    NDA3MmMwOWM1NDQyZThiMjA4MmIwZDlmYzM0ODAzZTRlM2NlODhlZDJhN2Q3
+    MzViNTU3N2Q0ZmZmZjUxYjM3ZTY5YWU3NjljNTQ3ZjQ1YTA1NWRlYmQyODUz
+    NGI2MDZmZDdjZmVmZTVlYTFmMTU0ZDljMzNjYzBkZGY0YTU5YjU=

data/lib/egon/overcloud/undercloud_handle/node.rb

@@ -13,12 +13,10 @@ module Overcloud
       service('Baremetal').nodes.find_by_uuid(node_id)
     end
     
-    def create_node(node_parameters, create_flavor = false)
+    def create_node(node_parameters)
       node = service('Baremetal').nodes.create(node_parameters)
       create_port({:node_uuid => node.uuid, :address => node_parameters[:address]})
 
-      create_flavor_from_node(node) if create_flavor
-
       node.set_provision_state('manage')
       introspect_node(node.uuid)
       node
@@ -28,7 +26,7 @@ module Overcloud
       service('Baremetal').ports.create(port_parameters)
     end
 
-    def create_nodes_from_csv(csv_file, create_flavor = false)
+    def create_nodes_from_csv(csv_file)
       CSV.foreach(csv_file) do |node_data|
         memory_mb = node_data[0]
         local_gb = node_data[1]
@@ -69,7 +67,7 @@ module Overcloud
           },
           :address => mac_address
         }
-        node = create_node(node_parameters, create_flavor)
+        node = create_node(node_parameters)
       end
     end
 
@@ -98,7 +96,11 @@ module Overcloud
                          'X-Auth-Token' => auth_token},
             :method  => 'GET'
           })
-      Fog::JSON.decode(response.body)['finished']
+      finished = Fog::JSON.decode(response.body)['finished']
+      if finished
+        create_flavor_from_node(get_node(node_uuid))
+      end
+      finished
     end
 
   end

data/lib/egon/version.rb

@@ -1,3 +1,3 @@
 module Egon
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/rubygem-egon.spec

@@ -12,10 +12,10 @@ License: GPL-3.0+
 URL: https://github.com/fusor/egon
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 BuildRequires: %{?scl_prefix}rubygems-devel
-BuildRequires: %{?scl_prefix}ruby
-BuildRequires: %{?scl_prefix}rubygem(fog) => 1.31.0
-BuildRequires: %{?scl_prefix}rubygem(net-ssh) => 2.9.2
-BuildRequires: %{?scl_prefix}rubygem(net-ssh) < 2.10
+Requires: %{?scl_prefix}ruby
+Requires: %{?scl_prefix}rubygem(fog) => 1.31.0
+Requires: %{?scl_prefix}rubygem(net-ssh) => 2.9.2
+Requires: %{?scl_prefix}rubygem(net-ssh) < 2.10
 BuildArch: noarch
 
 %description

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egon
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Egon and Fusor team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ files:
 - pkg/egon-0.4.1.gem
 - pkg/egon-0.4.2.gem
 - pkg/egon-0.4.4.gem
+- pkg/egon-0.4.5.gem
 - rubygem-egon.spec
 - test/test_ssh_connection.rb
 - test/test_undercloud.rb