staypuft 0.0.9 → 0.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ff35433d1c3032de55e7570d0bb4b743c65f35b7
+  data.tar.gz: 3ffdb215618e6332108f54714ceabdf612d4b129
+SHA512:
+  metadata.gz: 53fa9dcad17f281e454c1ceb5b02e72e12f9b440585d6309ce3dde5ad3da03325e42dd71b26e5cd919097e7c4e2cd21ebb11b962023ebdf91690bcd697d28e54
+  data.tar.gz: b2afa8a380522ae9d9083567e62a93da3d14cbf288eafa163d7fd2a70ca3c33ba7271c0901b3370abfd3b12da67bbefc25bbc950cffbe952cd6f35e22b803c24

data/app/assets/stylesheets/staypuft/staypuft.css.scss

@@ -21,6 +21,7 @@
   height: 300px;
   min-height: 200px;
   margin-right: 10px;
+  overflow: auto;
 }
 
 .nav > li > a.roles_list {

data/app/helpers/staypuft/deployments_helper.rb

@@ -8,5 +8,18 @@ module Staypuft
          _("Services Configuration")
       )
     end
+
+    def is_new
+      @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?)
+    end
+
   end
 end

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

@@ -54,7 +54,7 @@ module Staypuft::Concerns::HostgroupExtensions
     end
   end
 
-  Gem::Version.new(SETTINGS[:version].to_s.gsub(/-develop$/, '')) < Gem::Version.new('1.5') and
+  Gem::Version.new(SETTINGS[:version].notag) < Gem::Version.new('1.5') and
       Rails.logger.warn 'Foreman 1.5 is required for nesting of Hostgroups to work properly,' +
                             "please upgrade or expect failures.\n#{__FILE__}:#{__LINE__}"
 end

data/app/models/staypuft/deployment.rb

@@ -62,8 +62,9 @@ module Staypuft
       end
     end
 
-    # If layout networking is set to 'neutron', then set include_neutron on the
-    # hostgroup if it includes the "quickstack::pacemaker::params" puppetclass
+    # If layout networking is set to 'neutron', then set include_neutron and
+    # neutron on the hostgroup if it includes the "quickstack::pacemaker::params"
+    #  puppetclass
     def set_networking_params
       child_hostgroups.each do |the_hostgroup|
         the_hostgroup.puppetclasses.each do |pclass|
@@ -71,6 +72,10 @@ module Staypuft
             the_hostgroup.set_param_value_if_changed(pclass, "include_neutron",
                                      (layout.networking == 'neutron') ? true : false)
           end
+          if pclass.class_params.where(:key=> "neutron").first          
+            the_hostgroup.set_param_value_if_changed(pclass, "neutron",
+                                     (layout.networking == 'neutron') ? true : false)
+          end
         end
       end        
     end

data/app/models/staypuft/service.rb

@@ -87,8 +87,8 @@ module Staypuft
                             "ovs_vxlan_udp_port", "qpid_host", "ssl",
                             "tenant_network_type", "tunnel_id_ranges", "verbose"],
       "Neutron-ovs-agent"=> [],
-      "Swift" => ["swift_all_ips", "swift_ext4_device", "swift_local_interface",
-                  "swift_loopback", "swift_ring_server", "swift_shared_secret"]
+      "Swift (node)" => ["swift_all_ips", "swift_ext4_device", "swift_local_interface",
+                         "swift_loopback", "swift_ring_server", "swift_shared_secret"]
 
     }
 

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

@@ -1,10 +1,15 @@
 <%= render :layout => 'title' do %>
+  <% if anything_deployed %>
+    <%= alert :class => 'alert-warning', :text => _('Machines are already deployed with this configuration. Proceed with caution.') %>
+  <% end %>
+
   <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
     <%= base_errors_for @deployment %>
 
     <div class="wizard-container">
       <%= deployment_wizard 1 %>
     </div>
+
     <%= text_f f, :name %><br />
     <%= textarea_f f, :description, :rows => 3 %><br />
 
@@ -42,9 +47,14 @@
     </div>
  -->
     <div class="form_actions">
+      <% if !is_new %>
+        <%= 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" %>
+      <% end %>
       <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
         <%= _("Next") %>
         <span class="glyphicon glyphicon-chevron-right"></span>

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

@@ -1,4 +1,8 @@
 <%= render :layout => 'title' do %>
+  <% if anything_deployed %>
+    <%= alert :class => 'alert-warning', :text => _('Machines are already deployed with this configuration. Proceed with caution.') %>
+  <% end %>
+
   <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
     <%= base_errors_for @deployment %>
 
@@ -45,8 +49,7 @@
         <span class="glyphicon glyphicon-chevron-left"></span>
         <%= _("Back") %>
       </a>
-      <%= link_to _("Cancel"), deployment_path(@deployment), :method => :delete,
-                  :confirm => _("This will clear whole deployment configuration. Are you sure?"),
+      <%= link_to _("Cancel"), deployment_path(@deployment),
                   :class => "btn btn-danger" %>
       <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
         <%= _("Submit") %>

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

@@ -1,4 +1,8 @@
 <%= render :layout => 'title' do %>
+  <% if anything_deployed %>
+    <%= alert :class => 'alert-warning', :text => _('Machines are already deployed with this configuration. Proceed with caution.') %>
+  <% end %>
+
   <%= form_for(@deployment, :url => wizard_path, :method => 'PUT') do |f| %>
     <%= base_errors_for @deployment %>
 
@@ -27,8 +31,7 @@
         <span class="glyphicon glyphicon-chevron-left"></span>
         <%= _("Back") %>
       </a>
-      <%= link_to _("Cancel"), deployment_path(@deployment), :method => :delete,
-                  :confirm => _("This will clear whole deployment configuration. Are you sure?"),
+      <%= link_to _("Cancel"), deployment_path(@deployment),
                   :class => "btn btn-danger" %>
       <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
         <%= _("Next") %>

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

@@ -2,6 +2,7 @@
 
 <% content_for(:title_actions) do %>
 
+  <%= link_to(_("Edit"), deployment_steps_path) %>
   <%= link_to(_("Configuration Summary"), summary_deployment_path(@deployment.id), :class => '') %>
 
   <% if Rails.env.development? %>
@@ -46,15 +47,15 @@
       <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">
-            <span class="glyphicon glyphicon-ok"></span>
+            <i class="glyphicon glyphicon-ok"></i>
             <span><%= child_hostgroup.hosts.select { |h| h.open_stack_deployed? && !h.error? }.count %></span>
           </div>
           <div class="col-xs-2 text-center">
-            <span class="glyphicon glyphicon-warning-sign"></span>
+            <i class="glyphicon glyphicon-warning-sign"></i>
             <span><%= child_hostgroup.hosts.select { |h| h.open_stack_deployed? && h.error? }.count %></span>
           </div>
           <div class="col-xs-2 text-center">
-            <span class="glyphicon glyphicon-time"></span>
+            <i class="glyphicon glyphicon-time"></i>
             <span><%= child_hostgroup.hosts.select { |h| !h.open_stack_deployed? }.count %></span>
           </div>
           <div class="col-xs-6"><%= child_hostgroup.name %></div>

data/db/seeds.rb

@@ -13,6 +13,8 @@ params = {
   "heat_cfn"                      => "false",
   "heat_cloudwatch"               => "false",
   "admin_password"                => SecureRandom.hex,
+  "ceilometer"                    => "true",
+  "ceilometer_host"               => "false",
   "ceilometer_metering_secret"    => SecureRandom.hex,
   "ceilometer_user_password"      => SecureRandom.hex,
   "cinder_db_password"            => SecureRandom.hex,
@@ -105,6 +107,7 @@ params = {
   "horizon_key"                   => "/etc/pki/tls/private/PUB_HOST-horizon.key",
   "qpid_nssdb_password"           => SecureRandom.hex,
   "fence_xvm_key_file_password"   => SecureRandom.hex,
+  "use_qemu_for_poc"              => "false",
 }
 
 def get_key_type(value)
@@ -148,7 +151,7 @@ services = {
   :nova_compute       => {:name => "Nova-compute", :class => []},
   :neutron_compute    => {:name => "Neutron-compute", :class => []},
   :neutron_ovs_agent  => {:name => "Neutron-ovs-agent", :class => []},
-  :swift              => {:name => "Swift", :class => []},
+  :swift              => {:name => "Swift (node)", :class => []},
   :ha_controller      => {:name => "HA (Controller)", :class => ["quickstack::openstack_common",
                                                                  "quickstack::pacemaker::common",
                                                                  "quickstack::pacemaker::params"]},
@@ -160,7 +163,10 @@ services = {
   :glance_ha             => {:name => "Glance (HA)", :class => ["quickstack::pacemaker::glance"]},
   :nova_ha               => {:name => "Nova (HA)", :class => ["quickstack::pacemaker::nova"]},
   :cinder_ha             => {:name => "Cinder (HA)", :class => ["quickstack::pacemaker::cinder"]},
-  :ha_db_temp            => {:name => "Database (HA -- temp)", :class => ["quickstack::hamysql::singlenodetest"]}
+  :swift_ha              => {:name => "Swift (HA)", :class => ["quickstack::pacemaker::swift"]},
+  :horizon_ha            => {:name => "Horizon (HA)", :class => ["quickstack::pacemaker::horizon"]},
+  :mysql_ha              => {:name => "Mysql (HA)", :class => ["quickstack::pacemaker::mysql"]},
+  :neutron_ha            => {:name => "Neutron (HA)", :class => ["quickstack::pacemaker::neutron"]}
 }
 services.each do |skey, svalue|
   service = Staypuft::Service.where(:name=>svalue[:name]).first_or_create!
@@ -196,7 +202,7 @@ end
 roles = [
     {:name=>"Controller (Nova)",
      :class=>"quickstack::nova_network::controller",
-     :layouts=>[[:non_ha_nova, 2]],
+     :layouts=>[[:non_ha_nova, 1]],
      :services=>[:non_ha_qpid, :mysql, :non_ha_keystone, :nova_controller, :non_ha_glance, :cinder, :heat, :ceilometer]},
     {:name=>"Compute (Nova)",
      :class=>"quickstack::nova_network::compute",
@@ -204,7 +210,7 @@ roles = [
      :services=>[:nova_compute]},
     {:name=>"Controller (Neutron)",
      :class=>"quickstack::neutron::controller",
-     :layouts=>[[:non_ha_neutron, 2]],
+     :layouts=>[[:non_ha_neutron, 1]],
      :services=>[:non_ha_qpid, :mysql, :non_ha_keystone, :neutron_controller, :non_ha_glance, :cinder, :heat, :ceilometer]},
     {:name=>"Compute (Neutron)",
      :class=>"quickstack::neutron::compute",
@@ -216,25 +222,16 @@ roles = [
      :services=>[:neutron_l3, :dhcp, :ovs]},
     {:name=>"LVM Block Storage",
      :class=>"quickstack::storage_backend::lvm_cinder",
-     :layouts=>[[:ha_nova, 1], [:ha_neutron, 1], [:non_ha_nova, 1], [:non_ha_neutron, 1]],
+     :layouts=>[[:ha_nova, 2], [:ha_neutron, 2], [:non_ha_nova, 2], [:non_ha_neutron, 2]],
      :services=>[:cinder]},
     {:name=>"Swift Storage Node",
      :class=>"quickstack::swift::storage",
      :layouts=>[[:ha_nova, 5], [:ha_neutron, 5], [:non_ha_nova, 5], [:non_ha_neutron, 5]],
      :services=>[:swift]},
-    {:name=>"HA Controller (Nova)",
+    {:name=>"HA Controller",
      :class=>[],
-     :layouts=>[[:ha_nova, 3]],
-     :services=>[:ha_controller, :keystone_ha, :load_balancer_ha, :memcached_ha, :qpid_ha, :glance_ha, :nova_ha, :cinder_ha]},
-    {:name=>"HA Controller (Neutron)",
-     :class=>[],
-     :layouts=>[[:ha_neutron, 2]],
-     :services=>[]},
-         # this one is temporary -- goes away once db is added back to HA COntroller
-    {:name=>"HA Database (temporary)",
-     :class=>[],
-     :layouts=>[[:ha_nova, 2]],
-     :services=>[:ha_db_temp]}
+     :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]}
         ]
 
 roles.each do |r|

data/lib/staypuft/version.rb

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

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman_discovery
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -82,65 +73,65 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/staypuft/staypuft.js
-- app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss
-- app/assets/stylesheets/staypuft/staypuft.css.scss
-- app/controllers/staypuft/application_controller.rb
-- app/controllers/staypuft/deployment_steps_controller.rb
-- app/controllers/staypuft/deployments_controller.rb
 - app/helpers/staypuft/application_helper.rb
 - app/helpers/staypuft/deployments_helper.rb
-- app/lib/actions/staypuft/deployment/deploy.rb
-- app/lib/actions/staypuft/deployment/populate.rb
-- app/lib/actions/staypuft/host/build.rb
-- app/lib/actions/staypuft/host/create.rb
-- app/lib/actions/staypuft/host/deploy.rb
-- app/lib/actions/staypuft/host/puppet_run.rb
-- app/lib/actions/staypuft/host/wait_until_host_ready.rb
-- app/lib/actions/staypuft/host/wait_until_installed.rb
-- app/lib/actions/staypuft/hostgroup/deploy.rb
-- app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
-- app/lib/actions/staypuft/middleware/as_current_user.rb
-- app/lib/staypuft/exception.rb
-- app/models/setting/staypuft_provisioning.rb
-- app/models/staypuft/concerns/environment_extensions.rb
-- app/models/staypuft/concerns/host_open_stack_affiliation.rb
-- app/models/staypuft/concerns/host_orchestration_build_hook.rb
-- app/models/staypuft/concerns/hostgroup_extensions.rb
-- app/models/staypuft/concerns/puppetclass_extensions.rb
+- app/assets/javascripts/staypuft/staypuft.js
+- app/assets/stylesheets/staypuft/staypuft.css.scss
+- app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss
+- app/models/staypuft/service.rb
+- app/models/staypuft/role_class.rb
 - app/models/staypuft/deployment.rb
+- app/models/staypuft/role_service.rb
 - app/models/staypuft/deployment_role_hostgroup.rb
 - app/models/staypuft/layout.rb
+- app/models/staypuft/service_class.rb
+- app/models/staypuft/concerns/host_orchestration_build_hook.rb
+- app/models/staypuft/concerns/hostgroup_extensions.rb
+- app/models/staypuft/concerns/host_open_stack_affiliation.rb
+- app/models/staypuft/concerns/puppetclass_extensions.rb
+- app/models/staypuft/concerns/environment_extensions.rb
 - app/models/staypuft/layout_role.rb
 - app/models/staypuft/role.rb
-- app/models/staypuft/role_class.rb
-- app/models/staypuft/role_service.rb
-- app/models/staypuft/service.rb
-- app/models/staypuft/service_class.rb
-- app/views/staypuft/deployment_steps/_title.html.erb
-- app/views/staypuft/deployment_steps/deployment_settings.html.erb
-- app/views/staypuft/deployment_steps/services_configuration.html.erb
-- app/views/staypuft/deployment_steps/services_selection.html.erb
+- app/models/setting/staypuft_provisioning.rb
+- app/lib/staypuft/exception.rb
+- app/lib/actions/staypuft/middleware/as_current_user.rb
+- app/lib/actions/staypuft/hostgroup/deploy.rb
+- app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
+- app/lib/actions/staypuft/host/deploy.rb
+- app/lib/actions/staypuft/host/build.rb
+- app/lib/actions/staypuft/host/wait_until_host_ready.rb
+- app/lib/actions/staypuft/host/puppet_run.rb
+- app/lib/actions/staypuft/host/create.rb
+- app/lib/actions/staypuft/host/wait_until_installed.rb
+- app/lib/actions/staypuft/deployment/deploy.rb
+- app/lib/actions/staypuft/deployment/populate.rb
+- app/controllers/staypuft/deployments_controller.rb
+- app/controllers/staypuft/application_controller.rb
+- app/controllers/staypuft/deployment_steps_controller.rb
 - app/views/staypuft/deployments/index.html.erb
 - app/views/staypuft/deployments/show.html.erb
 - app/views/staypuft/deployments/summary.html.erb
+- app/views/staypuft/deployment_steps/deployment_settings.html.erb
+- app/views/staypuft/deployment_steps/services_selection.html.erb
+- app/views/staypuft/deployment_steps/_title.html.erb
+- app/views/staypuft/deployment_steps/services_configuration.html.erb
 - app/views/staypuft/layouts/staypuft.html.erb
-- config/routes.rb
 - config/staypuft.local.rb
+- config/routes.rb
+- db/migrate/20140312050615_create_staypuft_role_classes.rb
 - db/migrate/20140309021811_create_staypuft_layouts.rb
-- db/migrate/20140310004533_create_staypuft_deployments.rb
+- db/migrate/20140310203855_create_staypuft_role_services.rb
 - db/migrate/20140310023613_create_staypuft_roles.rb
-- db/migrate/20140310174152_create_staypuft_layout_roles.rb
+- db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
+- db/migrate/20140326032027_drop_staypuft_hostgroup_roles.rb
 - db/migrate/20140310194221_create_staypuft_services.rb
-- db/migrate/20140310203855_create_staypuft_role_services.rb
-- db/migrate/20140312044533_create_staypuft_deployment_role_hostgroups.rb
 - db/migrate/20140312050001_create_staypuft_hostgroup_roles.rb
-- db/migrate/20140312050615_create_staypuft_role_classes.rb
-- db/migrate/20140312051144_create_staypuft_service_classes.rb
-- db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
+- db/migrate/20140310174152_create_staypuft_layout_roles.rb
 - db/migrate/20140318163222_add_deploy_order_to_staypuft_layout_role.rb
-- db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
-- db/migrate/20140326032027_drop_staypuft_hostgroup_roles.rb
+- db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
+- db/migrate/20140312051144_create_staypuft_service_classes.rb
+- db/migrate/20140312044533_create_staypuft_deployment_role_hostgroups.rb
+- db/migrate/20140310004533_create_staypuft_deployments.rb
 - db/seeds.rb
 - lib/staypuft/engine.rb
 - lib/staypuft/version.rb
@@ -149,40 +140,39 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-- test/factories/staypuft_factories.rb
-- test/integration/navigation_test.rb
-- test/staypuft_test.rb
 - test/test_helper.rb
-- test/test_plugin_helper.rb
+- test/staypuft_test.rb
 - test/unit/staypuft_test.rb
+- test/integration/navigation_test.rb
+- test/factories/staypuft_factories.rb
+- test/test_plugin_helper.rb
 homepage: https://github.com/theforeman/staypuft
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OpenStack Foreman Installer
 test_files:
-- test/factories/staypuft_factories.rb
-- test/integration/navigation_test.rb
-- test/staypuft_test.rb
 - test/test_helper.rb
-- test/test_plugin_helper.rb
+- test/staypuft_test.rb
 - test/unit/staypuft_test.rb
+- test/integration/navigation_test.rb
+- test/factories/staypuft_factories.rb
+- test/test_plugin_helper.rb