egon 0.4.7 → 0.4.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2QyNjZmOTFiMGRhZDU2OTQ1N2M0NDZiZDNhZDQ2OGZlNWE1MTE0OA==
+    MGNhYmJkNjMxMWQ0ZWVlOWVjMTQxNDI5Y2ZiNWI2OTZlYWZjMjZlYQ==
   data.tar.gz: !binary |-
-    NmJmMzY3NWJmNDdkYWUxZTU1YjcxNzE4ZDkzYzQyYWNlMDkwOGYzMA==
+    MGJjODRiZjVjYzE3ZGZhZDc4YWNkNTQzMGJlOGNjNjk1MzAwZTg3MQ==
 SHA512:
   metadata.gz: !binary |-
-    ZmVkOTljYTVlZDQ3YWU2MTE2NTQ4NWY4MDVlNDA1N2Y3ZjFmYjE1ZGQyMDI3
-    Mzc4NDEzNjJkNzRkYzNjYWViOTEzODJjNjc2NDMyMDExMTZhZmM2MGVkNjll
-    OGY4ZWU4Y2ViYWZlYTNhMTk2NDI5NDZiOWE5ODhhMzQ5ZGYyMzI=
+    ZDE3ZjFiNjJlODMwM2ZlZmM4ZjdmMWY5ZWIxNjcyNjA0MmM0Mjc1ZDFjOTZh
+    MGY2NDllMjQ0NDE4YTY1ZDI1NzMwMjQxZDliMjEzZjQ2NWVmYTRhMDZhYzZh
+    ODdiZWQwNzI3NzFjYWYwOTliOTAyNTQ5NWFjYzM4MzdhYTBlNGI=
   data.tar.gz: !binary |-
-    YjliZDVmZDZiZWY0MGNmOGY1ZTVjMWY0Y2ZhZTkyM2MwNGFiOTg3MDRmNTJm
-    MWM4OTU1MjZkMWUxMDA3ZGFmNzE4NDcwOGM1MTZjMDRlY2I3NjM0NWJkZjBi
-    M2ViZjA1ZmM2ZDNhYjA0MjBjOGEwNWRhODUzYWM2ZWI5MWQ2MjU=
+    MDQwNGQ4Yjk1ZmUyNTBmNGI0ZjRjNTk3NTUxOTQ2NTBlODMwZGNhNzY2ODdh
+    MWE3MjM5MWUzZTVkYTc4NzdiNjVjODU0NmU0OTU1YmQzZjQyMGU1ZGJhMjRh
+    MTQ2NjE5NWU3ZjE3NzY4ZTdlYTI0ZWUwNjY5NzUwYWE5ZjczNTA=

data/bin/undercloud-install-local.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/ruby
 require 'egon/undercloud/commands'
 require 'egon/undercloud/installer'
 

data/bin/undercloud-install-satellite.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/ruby
 require 'egon/undercloud/commands'
 require 'egon/undercloud/ssh-connection'
 require 'egon/undercloud/installer'

data/bin/undercloud-install-vanilla-rhel.rb

@@ -1,3 +1,4 @@
+#! /usr/bin/ruby
 require 'egon/undercloud/commands'
 require 'egon/undercloud/ssh-connection'
 require 'egon/undercloud/installer'

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

@@ -47,7 +47,7 @@ module Overcloud
       for role in list_deployment_roles
         flavor_parameter_name = role.name + "-1::Flavor"
         flavor_parameter_value = get_plan_parameter_value(plan_name, flavor_parameter_name)
-        if flavor_parameter_value.to_s == ''
+        if flavor_parameter_value.to_s == 'baremetal'
           edit_plan_deployment_role_count(plan_name, role.name, 0)
           edit_plan_deployment_role_flavor(plan_name, role.name, default_flavor.name)
         end

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

@@ -14,11 +14,16 @@ module Overcloud
     end
     
     def create_node(node_parameters)
+      node = create_node_only(node_parameters)
+      introspect_node(node.uuid)
+      node
+    end
+
+    def create_node_only(node_parameters)
       node = service('Baremetal').nodes.create(node_parameters)
       create_port({:node_uuid => node.uuid, :address => node_parameters[:address]})
 
       node.set_provision_state('manage')
-      introspect_node(node.uuid)
       node
     end
 
@@ -71,6 +76,10 @@ module Overcloud
       end
     end
 
+    def delete_node(node_id)
+      service('Baremetal').nodes.destroy(node_id)
+    end
+
     ## THESE METHODS ARE TEMPORARY UNTIL IRONIC-DISCOVERD IS ADDED TO
     ## OPENSTACK AND KEYSTONE
 
@@ -96,8 +105,12 @@ module Overcloud
                          'X-Auth-Token' => auth_token},
             :method  => 'GET'
           })
-      finished = Fog::JSON.decode(response.body)['finished']
+      body = Fog::JSON.decode(response.body)
+      finished = body['finished']
       if finished
+        if body['error']
+          raise body['error']
+        end
         create_flavor_from_node(get_node(node_uuid))
       end
       finished

data/lib/egon/version.rb

@@ -1,3 +1,3 @@
 module Egon
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

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