staypuft 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b2f7a42251bc0433abba04f69a42dd0a44ee334
-  data.tar.gz: 78482c6e8e64e8729a9e68fb30065570f0e4f217
+  metadata.gz: 54176ed2876a5cfe10a15aa19cbfdbf35d89d8a1
+  data.tar.gz: 3fc002583ba2458fd7cf9c41a592c77f533023d6
 SHA512:
-  metadata.gz: 7ab57733b68acf613c73164df5c9084b421db7e322aa32cad1196fa80ddd799d08568f3e88feb77cdbf7076c8852c88309fb7493d3118e133896d58d42482085
-  data.tar.gz: 974fdbedc6ef92a7fc68e399e1f5249195647a74a52f9e69017a069994395103b0b08bdc2c5e25ae4010cebf8da08aaa273bab42cde728733ea4549edd1c829a
+  metadata.gz: 34345fe56f017bc92e93c906ee7608aa6a0a6518522b39961153287ab8ef7bc91f0eb382410c124fdd30b1d51d8f42cb7f6e57ca4ab006668361f832ad649476
+  data.tar.gz: f1a524875345eff51897ebc887811d3164d58404e1f55abce6b522c71d9a84bbee8a483ef429db09218b3087dbf11d6f85ac149af674830a735f6d00fa6b7b4d

data/README.md

@@ -15,14 +15,6 @@ Symlink `config/staypuft.local.rb` to yours Foreman `bundle.d`.
 
 See [this](doc/setup.md) document.
 
-## TODO
-
-Much to do:
-* UI For launching a basic provisioning workflow,
-* Deploy a 3-controller HA configuration,
-* Configure an HA OpenStack deployment with three controller nodes and as many compute and storage nodes as are required,
-* Configure an OpenStack deployment with a single controller node.
-
 ## Contributing
 
 Fork and send a Pull Request. Thanks!

data/app/controllers/staypuft/deployment_steps_controller.rb

@@ -10,7 +10,7 @@ module Staypuft
       when :deployment_settings
         @layouts = ordered_layouts
       when :services_configuration
-        @services = @deployment.services
+        @services = @deployment.services.order(:name)
       end
 
       render_wizard
@@ -33,10 +33,10 @@ module Staypuft
         end
       when :services_configuration
         # Collect services across all deployment's roles
-        @services = @deployment.roles(:services).map(&:services).flatten.uniq
+        @services = @deployment.services.order(:name)
         if params[:staypuft_deployment]
           param_data = params[:staypuft_deployment][:hostgroup_params]
-          diffs = []
+          diffs      = []
           param_data.each do |hostgroup_id, hostgroup_params|
             hostgroup = Hostgroup.find(hostgroup_id)
             hostgroup_params[:puppetclass_params].each do |puppetclass_id, puppetclass_params|
@@ -54,7 +54,7 @@ module Staypuft
 
     private
     def get_deployment
-      @deployment = Deployment.first
+      @deployment      = Deployment.first
       @deployment.name = nil if @deployment.name.starts_with?(Deployment::NEW_NAME_PREFIX)
     end
 

data/app/controllers/staypuft/deployments_controller.rb

@@ -63,34 +63,18 @@ module Staypuft
       hosts_to_assign = targeted_hosts - assigned_hosts
       hosts_to_remove = assigned_hosts - targeted_hosts
 
-      hosts_to_assign.each do |discovered_host|
-        original_type = discovered_host.type
-        host          = discovered_host.becomes(::Host::Managed)
-        host.type     = 'Host::Managed'
-        host.managed  = true
-        host.build    = true
-
-        host.hostgroup   = hostgroup
-        # set discovery environment to keep booting discovery image
-        host.environment = Environment.get_discovery
-
-        # root_pass is not copied for some reason
-        host.root_pass   = hostgroup.root_pass
-
-        # I do not why but the final save! adds following condytion to the update SQL command
-        # "WHERE "hosts"."type" IN ('Host::Managed') AND "hosts"."id" = 283"
-        # which will not find the record since it's still Host::Discovered.
-        # Using #update_column to change it directly in DB
-        # (discovered_host is used to avoid same WHERE condition problem here).
-        # FIXME this is definitely ugly, needs to be properly fixed
-        discovered_host.update_column :type, 'Host::Managed'
-
-        begin
-          host.save!
-        rescue => e
-          discovered_host.update_column :type, original_type
-          raise e
-        end
+      unassigned_hosts = hosts_to_assign.reduce([]) do |unassigned_hosts, discovered_host|
+        success, host = assign_host_to_hostgroup discovered_host, hostgroup
+        success ? unassigned_hosts : [*unassigned_hosts, host]
+      end
+
+      unless unassigned_hosts.empty?
+        flash[:warning] = 'Unassigned hosts: ' + unassigned_hosts.map(&:name_was).join(', ')
+        Rails.logger.warn(
+            "Unassigned hosts: \n" +
+                unassigned_hosts.
+                    map { |h| format '%s (%s)', h.name_was, h.errors.full_messages.join(',') }.
+                    join("\n"))
       end
 
       hosts_to_remove.each do |host|
@@ -100,6 +84,35 @@ module Staypuft
 
       redirect_to deployment_path(id: ::Staypuft::Deployment.first)
     end
+
+    private
+
+    def assign_host_to_hostgroup(discovered_host, hostgroup)
+      original_type = discovered_host.type
+      host          = discovered_host.becomes(::Host::Managed)
+      host.type     = 'Host::Managed'
+      host.managed  = true
+      host.build    = true
+
+      host.hostgroup   = hostgroup
+      # set discovery environment to keep booting discovery image
+      host.environment = Environment.get_discovery
+
+      # root_pass is not copied for some reason
+      host.root_pass   = hostgroup.root_pass
+
+      # I do not why but the final save! adds following condytion to the update SQL command
+      # "WHERE "hosts"."type" IN ('Host::Managed') AND "hosts"."id" = 283"
+      # which will not find the record since it's still Host::Discovered.
+      # Using #update_column to change it directly in DB
+      # (discovered_host is used to avoid same WHERE condition problem here).
+      # FIXME this is definitely ugly, needs to be properly fixed
+      discovered_host.update_column :type, 'Host::Managed'
+
+      [host.save, host].tap do |saved, _|
+        discovered_host.becomes(Host::Base).update_column(:type, original_type) unless saved
+      end
+    end
   end
 
 end

data/app/helpers/staypuft/deployments_helper.rb

@@ -14,7 +14,7 @@ module Staypuft
     end
 
     def alert_if_deployed
-      if @deployment.hosts.any?(&:open_stack_deployed?)
+      if @deployment.deployed?
         (alert :class => 'alert-warning',
               :text => _('Machines are already deployed with this configuration. Changing the configuration parameters
                           is unsupported and may result in an unusable configuration. <br/>Please proceed with caution.'),

data/app/lib/actions/staypuft/deployment/deploy.rb

@@ -21,12 +21,8 @@ module Actions
         def plan(deployment)
           Type! deployment, ::Staypuft::Deployment
 
-          ordered_hostgroups = deployment.child_hostgroups.
-              reorder("#{::Staypuft::DeploymentRoleHostgroup.table_name}.deploy_order").to_a
           input.update id: deployment.id, name: deployment.name
-
-          plan_action Hostgroup::OrderedDeploy, ordered_hostgroups
-
+          plan_action Hostgroup::OrderedDeploy, deployment.child_hostgroups.deploy_order.to_a
           lock! deployment
         end
 

data/app/lib/actions/staypuft/deployment/populate.rb

@@ -29,10 +29,6 @@ module Actions
           Type! compute_resource, *[ComputeResource, (NilClass if fake)].compact
 
           sequence do
-            plan_self deployment_id:   deployment.id,
-                      deployment_name: deployment.name,
-                      fake:            fake,
-                      assign:          assign
 
             hostgroups = deployment.child_hostgroups
             hostgroups.each do |hostgroup|
@@ -47,15 +43,6 @@ module Actions
           end
         end
 
-        def run
-          deployment = ::Staypuft::Deployment.find input.fetch(:deployment_id)
-          hostgroups = deployment.child_hostgroups
-          hostgroups.each do |hostgroup|
-            hostgroup.hosts.each do |host|
-              host.destroy # TODO make action for it
-            end
-          end
-        end
 
         def humanized_input
           "#{input[:deployment_name]} #{input[:fake] ? 'fake' : 'real'}"

data/app/models/staypuft/concerns/hostgroup_extensions.rb

@@ -7,6 +7,9 @@ module Staypuft::Concerns::HostgroupExtensions
     has_one :role, :through => :deployment_role_hostgroup, :class_name => 'Staypuft::Role'
 
     has_one :deployment, :class_name => 'Staypuft::Deployment'
+
+    scope :deploy_order,
+          lambda { reorder "#{::Staypuft::DeploymentRoleHostgroup.table_name}.deploy_order" }
   end
 
   def add_puppetclasses_from_resource(resource)

data/app/models/staypuft/deployment.rb

@@ -10,9 +10,17 @@ module Staypuft
     belongs_to :hostgroup, :dependent => :destroy
 
     has_many :deployment_role_hostgroups, :dependent => :destroy
-    has_many :child_hostgroups, :through => :deployment_role_hostgroups, :class_name => 'Hostgroup',
-                                :source => :hostgroup
-    has_many :roles, :through => :deployment_role_hostgroups
+    has_many :child_hostgroups,
+             :through    => :deployment_role_hostgroups,
+             :class_name => 'Hostgroup',
+             :source     => :hostgroup
+
+    has_many :roles,
+             :through => :deployment_role_hostgroups
+    has_many :roles_ordered,
+             :through => :deployment_role_hostgroups,
+             :source  => :role,
+             :order   => "#{::Staypuft::DeploymentRoleHostgroup.table_name}.deploy_order"
 
     has_many :services, :through => :roles
     has_many :hosts, :through => :child_hostgroups
@@ -69,16 +77,20 @@ module Staypuft
     def set_networking_params
       child_hostgroups.each do |the_hostgroup|
         the_hostgroup.puppetclasses.each do |pclass|
-          if pclass.class_params.where(:key=> "include_neutron").first          
+          if pclass.class_params.where(:key => "include_neutron").first
             the_hostgroup.set_param_value_if_changed(pclass, "include_neutron",
-                                     (layout.networking == 'neutron') ? true : false)
+                                                     layout.networking == 'neutron')
           end
-          if pclass.class_params.where(:key=> "neutron").first          
+          if pclass.class_params.where(:key => "neutron").first
             the_hostgroup.set_param_value_if_changed(pclass, "neutron",
-                                     (layout.networking == 'neutron') ? true : false)
+                                                     layout.networking == 'neutron')
           end
         end
-      end        
+      end
+    end
+
+    def deployed?
+      self.hosts.any?(&:open_stack_deployed?)
     end
 
     private

data/app/models/staypuft/service.rb

@@ -15,7 +15,7 @@ module Staypuft
     # for a param name, an array of [param_name, puppetclass] in the case where
     # there are possibly multiple puppetclass matches. without this, we'll
     # just grab the first puppetclass from the matching hostgroup
-    UI_PARAMS = { 
+    UI_PARAMS = {
       "qpid (non-HA)"=> ["qpid_ca", "qpid_cert", "qpid_host", "qpid_key", "qpid_nssdb_password"],
       "MySQL"=> ["mysql_ca", "mysql_cert", "mysql_host", "mysql_key",
                  "mysql_root_password"],
@@ -53,8 +53,9 @@ module Staypuft
       "Cinder"=> ["cinder_backend_gluster", "cinder_backend_iscsi",
                   "cinder_db_password", "cinder_gluster_servers",
                   "cinder_gluster_volume", "cinder_user_password"],
-      "Heat"=> ["heat_cfn", "heat_cloudwatch", "heat_db_password", "heat_user_password"],
-      "Ceilometer"=> ["ceilometer_metering_secret", "ceilometer_user_password"
+      "Heat"=> ["heat_cfn", "heat_cloudwatch", "heat_db_password", "heat_user_password", "heat_auth_encrypt_key"],
+      "Ceilometer"=> ["ceilometer", "ceilometer_host",
+                      "ceilometer_metering_secret", "ceilometer_user_password"
                      ],
       "Neutron - L3" => ["controller_priv_host", "enable_tunneling",
                          "external_network_bridge", "fixed_network_range",
@@ -68,16 +69,18 @@ module Staypuft
                 "ovs_tunnel_iface", "ovs_tunnel_network", "ovs_tunnel_types",
                 "ovs_vlan_ranges", "ovs_vxlan_udp_port" ],
       "Nova-compute" => ["admin_password", "auto_assign_floating_ip",
+                         "ceilometer", "ceilometer_host",
                          "ceilometer_metering_secret", "ceilometer_user_password",
                          "cinder_backend_gluster", "controller_priv_host",
                          "controller_pub_host", "fixed_network_range",
                          "floating_network_range", "mysql_ca", "mysql_host",
                          "nova_db_password", "network_private_iface",
-                         "network_private_network", 
+                         "network_private_network",
                          "network_public_iface",
                          "network_public_network", "nova_user_password",
                          "qpid_host", "ssl", "verbose", "use_qemu_for_poc"],
-      "Neutron-compute" => ["admin_password", "ceilometer_metering_secret",
+      "Neutron-compute" => ["admin_password", "ceilometer", "ceilometer_host",
+                            "ceilometer_metering_secret",
                             "ceilometer_user_password", "cinder_backend_gluster",
                             "controller_admin_host", "controller_priv_host",
                             "controller_pub_host", "enable_tunneling", "mysql_ca",

data/app/views/staypuft/deployment_steps/services_selection.html.erb

@@ -9,7 +9,7 @@
     <h4><%= "#{@deployment.layout.name} - #{@deployment.layout.networking.capitalize} " + _("Networking") %></h4>
 
     <div class="clearfix">
-        <% @deployment.roles.each do |role| %>
+        <% @deployment.roles_ordered.each do |role| %>
           <div class="panel panel-default service-box">
             <div class="panel-heading"><strong><%= role.name %></strong></div>
             <div class="panel-body">

data/app/views/staypuft/deployments/show.html.erb

@@ -2,7 +2,11 @@
 
 <% content_for(:title_actions) do %>
 
-  <%= link_to(_("Edit"), deployment_steps_path) %>
+  <%= link_to(_("Edit"), if @deployment.deployed?
+                           deployment_step_path(id: 'services_configuration')
+                         else
+                           deployment_steps_path
+                         end) %>
   <%= link_to(_("Configuration Summary"), summary_deployment_path(@deployment.id), :class => '') %>
 
   <% if Rails.env.development? %>
@@ -33,7 +37,7 @@
   <% else %>
     <%= link_to(_("Deploy"),
                 "",
-                :class => %w(btn btn-success),
+                :class         => %w(btn btn-success),
                 :'data-toggle' => "modal",
                 :'data-target' => "#deploy_modal") %>
   <% end %>
@@ -43,7 +47,7 @@
 <div class="row tabbed_side_nav_table">
   <ul class="nav nav-pills nav-stacked col-md-4" data-tabs="pills">
     <h3><%= _("Host Groups") %></h3>
-    <% @deployment.child_hostgroups.each_with_index do |child_hostgroup, i| %>
+    <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a href="#<%= child_hostgroup.name.parameterize.underscore %>" data-toggle="tab" class="roles_list">
           <div class="col-xs-2 text-center">
@@ -66,7 +70,7 @@
   </ul>
 
   <div class="tab-content col-md-8">
-    <% @deployment.child_hostgroups.each_with_index do |child_hostgroup, i| %>
+    <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
       <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= child_hostgroup.name.parameterize.underscore %>">
         <h3><%= _("Hosts") %></h3>
         <% if child_hostgroup.own_and_free_hosts.present? %>
@@ -97,7 +101,16 @@
                                         :disabled => host.open_stack_deployed? %>
                       <%= hidden_field_tag 'host_ids[]', host.id if host.open_stack_deployed? %>
                     </td>
-                    <td class="ellipsis"><%= host.name %></td>
+                    <td class="ellipsis">
+                      <% case host %>
+                      <% when Host::Managed %>
+                        <%= link_to_if_authorized host.name, hash_for_host_path(host) %>
+                      <% when Host::Discovered %>
+                        <%= link_to_if_authorized host.name, hash_for_discover_path(host) %>
+                      <% else %>
+                        <%= host.name %>
+                      <% end %>
+                    </td>
                     <td class="hidden-s hidden-xs"><%= host.mac %></td>
                     <td class="hidden-s hidden-xs"><%= host.type %></td>
                   </tr>

data/db/seeds.rb

@@ -34,6 +34,7 @@ params = {
   "heat_db_password"              => SecureRandom.hex,
   "heat_user_password"            => SecureRandom.hex,
   "heat_cfn_user_password"        => SecureRandom.hex,
+  "heat_auth_encrypt_key"         => SecureRandom.hex,
   "horizon_secret_key"            => SecureRandom.hex,
   "keystone_admin_token"          => SecureRandom.hex,
   "keystone_db_password"          => SecureRandom.hex,

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks