staypuft 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff35433d1c3032de55e7570d0bb4b743c65f35b7
-  data.tar.gz: 3ffdb215618e6332108f54714ceabdf612d4b129
+  metadata.gz: 1b2f7a42251bc0433abba04f69a42dd0a44ee334
+  data.tar.gz: 78482c6e8e64e8729a9e68fb30065570f0e4f217
 SHA512:
-  metadata.gz: 53fa9dcad17f281e454c1ceb5b02e72e12f9b440585d6309ce3dde5ad3da03325e42dd71b26e5cd919097e7c4e2cd21ebb11b962023ebdf91690bcd697d28e54
-  data.tar.gz: b2afa8a380522ae9d9083567e62a93da3d14cbf288eafa163d7fd2a70ca3c33ba7271c0901b3370abfd3b12da67bbefc25bbc950cffbe952cd6f35e22b803c24
+  metadata.gz: 7ab57733b68acf613c73164df5c9084b421db7e322aa32cad1196fa80ddd799d08568f3e88feb77cdbf7076c8852c88309fb7493d3118e133896d58d42482085
+  data.tar.gz: 974fdbedc6ef92a7fc68e399e1f5249195647a74a52f9e69017a069994395103b0b08bdc2c5e25ae4010cebf8da08aaa273bab42cde728733ea4549edd1c829a

data/app/controllers/staypuft/deployment_steps_controller.rb

@@ -8,7 +8,7 @@ module Staypuft
     def show
       case step
       when :deployment_settings
-        @layouts = Layout.all
+        @layouts = ordered_layouts
       when :services_configuration
         @services = @deployment.services
       end
@@ -24,7 +24,7 @@ module Staypuft
 
       case step
       when :deployment_settings
-        @layouts = Layout.all
+        @layouts = ordered_layouts
 
         Deployment.transaction do
           @deployment.update_attributes(params[:staypuft_deployment])
@@ -61,5 +61,9 @@ module Staypuft
     def redirect_to_finish_wizard(options = {})
       redirect_to deployment_path(@deployment), :notice => _("Deployment has been succesfully configured.")
     end
+
+    def ordered_layouts
+      Layout.order(:name).order("networking DESC").all
+    end
   end
 end

data/app/controllers/staypuft/deployments_controller.rb

@@ -64,10 +64,11 @@ module Staypuft
       hosts_to_remove = assigned_hosts - targeted_hosts
 
       hosts_to_assign.each do |discovered_host|
-        host         = discovered_host.becomes(::Host::Managed)
-        host.type    = 'Host::Managed'
-        host.managed = true
-        host.build   = true
+        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
@@ -84,7 +85,12 @@ module Staypuft
         # FIXME this is definitely ugly, needs to be properly fixed
         discovered_host.update_column :type, 'Host::Managed'
 
-        host.save!
+        begin
+          host.save!
+        rescue => e
+          discovered_host.update_column :type, original_type
+          raise e
+        end
       end
 
       hosts_to_remove.each do |host|

data/app/helpers/staypuft/deployments_helper.rb

@@ -13,12 +13,13 @@ module Staypuft
       @deployment.name.empty?
     end
 
-    def anything_deployed
-      @deployment.child_hostgroups.
-        # this could be an association on deployment
-        inject([]) { |hosts, hg| hosts + hg.hosts }.
-        any?
-        # (:open_stack_deployed?)
+    def alert_if_deployed
+      if @deployment.hosts.any?(&:open_stack_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.'),
+              :close => false).html_safe
+      end
     end
 
   end

data/app/models/staypuft/deployment.rb

@@ -15,6 +15,7 @@ module Staypuft
     has_many :roles, :through => :deployment_role_hostgroups
 
     has_many :services, :through => :roles
+    has_many :hosts, :through => :child_hostgroups
 
     validates :name, :presence => true, :uniqueness => true
 

data/app/models/staypuft/service.rb

@@ -65,16 +65,18 @@ module Staypuft
                          "tenant_network_type", "tunnel_id_ranges", "verbose"],
       "DHCP" => [],
       "OVS" => ["ovs_bridge_mappings", "ovs_bridge_uplinks",
-                "ovs_tunnel_iface", "ovs_tunnel_types", "ovs_vlan_ranges",
-                "ovs_vxlan_udp_port" ],
+                "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_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", "nova_network_private_iface",
-                         "nova_network_public_iface", "nova_user_password",
-                         "qpid_host", "ssl", "verbose"],
+                         "nova_db_password", "network_private_iface",
+                         "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",
                             "ceilometer_user_password", "cinder_backend_gluster",
                             "controller_admin_host", "controller_priv_host",
@@ -83,12 +85,14 @@ module Staypuft
                             "neutron_db_password", "neutron_user_password",
                             "nova_db_password", "nova_user_password",
                             "ovs_bridge_mappings", "ovs_tunnel_iface",
-                            "ovs_tunnel_types", "ovs_vlan_ranges",
+                            "ovs_tunnel_network", "ovs_tunnel_types", "ovs_vlan_ranges",
                             "ovs_vxlan_udp_port", "qpid_host", "ssl",
-                            "tenant_network_type", "tunnel_id_ranges", "verbose"],
+                            "tenant_network_type", "tunnel_id_ranges", "verbose",
+                            "use_qemu_for_poc"],
       "Neutron-ovs-agent"=> [],
       "Swift (node)" => ["swift_all_ips", "swift_ext4_device", "swift_local_interface",
-                         "swift_loopback", "swift_ring_server", "swift_shared_secret"]
+                         "swift_local_network","swift_loopback", "swift_ring_server",
+                         "swift_shared_secret"]
 
     }
 

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

@@ -1,7 +1,5 @@
 <%= render :layout => 'title' do %>
-  <% if anything_deployed %>
-    <%= alert :class => 'alert-warning', :text => _('Machines are already deployed with this configuration. Proceed with caution.') %>
-  <% end %>
+  <%= alert_if_deployed %>
 
   <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
     <%= base_errors_for @deployment %>
@@ -17,7 +15,7 @@
       <div class="clearfix">
         <div class="form-group">
           <label class="col-md-2 control-label" for="layout_id"><%= _("Deployment Layout") %></label>
-          <div class="col-md-4">
+          <div class="col-md-6">
             <% @layouts.each do |layout| %>
               <%= radio_button_f_non_inline(f, :layout_id, :checked => layout.id == @deployment.layout_id,:value=>layout.id, :text=> "#{layout.name}, #{layout.networking.capitalize} " + _("Networking")) %>
             <% end %>
@@ -51,9 +49,9 @@
         <%= link_to _("Cancel"), deployment_path(@deployment),
                     :class => "btn btn-danger" %>
       <% else %>
-      <%= link_to _("Cancel"), deployment_path(@deployment), :method => :delete,
-                  :confirm => _("This will clear whole deployment configuration. Are you sure?"),
-                  :class => "btn btn-danger" %>
+        <%= link_to _("Cancel"), deployment_path(@deployment), :method => :delete,
+                    :confirm => _("This will clear whole deployment configuration. Are you sure?"),
+                    :class => "btn btn-danger" %>
       <% end %>
       <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
         <%= _("Next") %>

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

@@ -1,7 +1,5 @@
 <%= render :layout => 'title' do %>
-  <% if anything_deployed %>
-    <%= alert :class => 'alert-warning', :text => _('Machines are already deployed with this configuration. Proceed with caution.') %>
-  <% end %>
+  <%= alert_if_deployed %>
 
   <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
     <%= base_errors_for @deployment %>

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

@@ -1,7 +1,5 @@
 <%= render :layout => 'title' do %>
-  <% if anything_deployed %>
-    <%= alert :class => 'alert-warning', :text => _('Machines are already deployed with this configuration. Proceed with caution.') %>
-  <% end %>
+  <%= alert_if_deployed %>
 
   <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
     <%= base_errors_for @deployment %>

data/db/seeds.rb

@@ -158,10 +158,10 @@ services = {
   :keystone_ha           => {:name => "Keystone (HA)", :class => ["quickstack::pacemaker::keystone"]},
   :load_balancer_ha      => {:name => "Load Balancer (HA)", :class => ["quickstack::pacemaker::load_balancer"]},
   :memcached_ha          => {:name => "Memcached (HA)", :class => ["quickstack::pacemaker::memcached"]},
-  :qpid_ha               => {:name => "qpid (HA)", :class => ["quickstack::pacemaker::qpid",
-                                                      "qpid::server"]},
+  :qpid_ha               => {:name => "qpid (HA)", :class => ["quickstack::pacemaker::qpid"]},
   :glance_ha             => {:name => "Glance (HA)", :class => ["quickstack::pacemaker::glance"]},
   :nova_ha               => {:name => "Nova (HA)", :class => ["quickstack::pacemaker::nova"]},
+  :heat_ha               => {:name => "Heat (HA)", :class => ["quickstack::pacemaker::heat"]},
   :cinder_ha             => {:name => "Cinder (HA)", :class => ["quickstack::pacemaker::cinder"]},
   :swift_ha              => {:name => "Swift (HA)", :class => ["quickstack::pacemaker::swift"]},
   :horizon_ha            => {:name => "Horizon (HA)", :class => ["quickstack::pacemaker::horizon"]},
@@ -231,7 +231,7 @@ roles = [
     {:name=>"HA Controller",
      :class=>[],
      :layouts=>[[:ha_nova, 1], [:ha_neutron, 1]],
-     :services=>[:ha_controller, :keystone_ha, :load_balancer_ha, :memcached_ha, :qpid_ha, :glance_ha, :nova_ha, :cinder_ha, :swift_ha, :horizon_ha, :mysql_ha, :neutron_ha]}
+     :services=>[:ha_controller, :keystone_ha, :load_balancer_ha, :memcached_ha, :qpid_ha, :glance_ha, :nova_ha, :heat_ha, :cinder_ha, :swift_ha, :horizon_ha, :mysql_ha, :neutron_ha]}
         ]
 
 roles.each do |r|

data/lib/staypuft/version.rb

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

metadata

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