egon 0.4.4 → 0.4.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTEwNTZmMzE3ZmVhOThhNmMwMWUyMDIxZTAwMzc5NjE1ZjBiOGZlNA==
+    NzBlNWIyYmVjOGY3YWQ0NWJjZTY4OTVlZDg0MjBlYzE5ODU0MTU4Mw==
   data.tar.gz: !binary |-
-    ZjAyY2MxN2ZjYTEyMDBmNTlkZTBhN2FiOWY0ODM0MGQ3YjdiZDA4Mg==
+    NTUxNTViMTM2MjlkNDJiN2M3Zjc4MWY4YWFhMTc0YjExNDYzZWE5OA==
 SHA512:
   metadata.gz: !binary |-
-    NzdlZTZmMTM2YjY0ZjY2MzkyOTg1NjU2OWQzZDRmZWUzNGQyYTdiZWMwNTI0
-    YmRkOWM4YWY4N2E5OGMyMWNiYWFkMjY0NTkyNDgyNGQxODkzMDVmNThlNDMx
-    Y2JlNmFiMTI3ODkxMjkyOGI0NzYwOGRkN2JjZGVjNTEyNzVhYWY=
+    NDRmZTA4YzhmNWFhZjhjNGE5OGNlZWEzNzcxYjdlZGM4YzlhYWJmMDM0MWY0
+    MjI1MWI0MWEzODRiMDQ2ZTk0NTFhYWY2Y2U1M2FmZDBmNDk1N2Q0YzJmY2I4
+    ZGFjZTNlZGVhOTA1NWEzMGRlNjUxZmU5YWQ3MWZiZDIxODljYjE=
   data.tar.gz: !binary |-
-    YjRmZDM4MTA5MjE2ODJmYmQ0Y2Q4ZmM0ODYwODg0MjI3NjU0MDA2YTI4OGMw
-    NzI2NWU1MjYyNWZhM2YzYTkwODI2NmYzMWU2ZjhmNzQ0NDNjY2NmYTEyZTBj
-    MjVjYTI5ZjRjZmI5NzVjNDgyMjVhY2FlMzVhOTViYTUyMDE0YzM=
+    MDBlZGNlNGQ2MGQyNDBmYzE3NWM2NzliNjFmNDQyYjNmMzQ0Zjk2YTBmMzFl
+    OWZkYzAxNGY1MmNkMTE5YjJmNDE3MzNmMWI0ZTFhNmVkZmI1MGVkZjE2OTUz
+    NDEyNjhiNzI0NGNkNDI4ZDUyNmUyN2I3ZDVhZDE4MDAzMWUyNmE=

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

@@ -5,6 +5,16 @@ module Overcloud
       service('Planning').plans.find_by_name(plan_name)
     end
 
+    def get_plan_parameter_value(plan_name, parameter_name)
+      params = get_plan(plan_name).parameters
+      param = params.find{|param| param["name"] == parameter_name }
+      if param
+        param["value"]
+      else
+        nil
+      end
+    end
+
     def edit_plan_parameters(plan_name, parameters)
       get_plan(plan_name).patch(:parameters => parameters)
     end
@@ -25,15 +35,26 @@ module Overcloud
     end
 
     def deploy_plan(plan_name)
+      plan = get_plan(plan_name)
+
       # ensure that nodes are in correct state
       for node in list_nodes
         node.set_provision_state('provide') if node.provision_state == 'manageable'
       end
 
-      plan = get_plan(plan_name)
-      templates = Hash[plan.provider_resource_templates]
+      # assign all unassigned roles; make sure their count is 0
+      default_flavor = list_flavors[0]
+      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 == ''
+          edit_plan_deployment_role_count(plan_name, role.name, 0)
+          edit_plan_deployment_role_flavor(plan_name, role.name, default_flavor.name)
+        end
+      end
 
       # temporary workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1212740
+      templates = Hash[plan.provider_resource_templates]
       templates.keys.each do |template_path|
         if template_path.index('puppet/') == 0
           new_template_path = template_path.sub('puppet/','')

data/lib/egon/version.rb

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

metadata

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