staypuft 0.0.16 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3838e8c00d0d5bb0470cfb8ec3ead91142f0dec7
+  data.tar.gz: ea81452c4bd0eb33f7d3e80483130b203b865683
+SHA512:
+  metadata.gz: 68f8d5ba659d5126bb79d7545b50a05c3f4e63403b3454524c03b0bd2bde8bcfa8d0477c791ffbdc1eba53472a33536cb5d051eee8013e9f42320236cf5347c9
+  data.tar.gz: 3735abe4f8ab42404e9e1e05fea550bc1f9b20687702c38024d5af5c6c77f3c0db95b7cf9611e7b3ffae7a92b65ce0cd651177bc643f8c18dc3c5e2efa0d039a

data/app/assets/javascripts/staypuft/staypuft.js

@@ -12,15 +12,19 @@
 //
 //= require_tree .
 
-$(function() {
+$(function () {
   // Check all checkboxes in table
-  $('#check_all').on('change', function(e) {
+  $('#check_all').on('change', function (e) {
     var table = $(e.target).closest('table');
     $('td input:checkbox', table).attr('checked', e.target.checked);
     $('td input:checkbox', table).closest("tr").toggleClass("info", this.checked);
   });
 
-  $("tr.checkbox_highlight input:checkbox").on('change', function(e) {
-    $(this).closest("tr").toggleClass("info", this.checked);
+  $("tr.checkbox_highlight input:checkbox").on('change', function (e) {
+    var tr = $(this).closest("tr");
+    tr.toggleClass("info", this.checked);
+    if (tr.hasClass("deployed")) {
+      tr.toggleClass("danger", !this.checked);
+    }
   });
 });

data/app/controllers/staypuft/deployments_controller.rb

@@ -9,7 +9,8 @@ module Staypuft
     def new
       base_hostgroup = Hostgroup.get_base_hostgroup
 
-      deployment           = Deployment.new(:name => Deployment::NEW_NAME_PREFIX+SecureRandom.hex)
+      deployment           = Deployment.new(:name => Deployment::NEW_NAME_PREFIX+SecureRandom.hex,
+                                            :amqp_provider => Deployment::AMQP_RABBITMQ)
       deployment.layout    = Layout.where(:name       => "Distributed",
                                           :networking => "neutron").first
       deployment_hostgroup = ::Hostgroup.new name: deployment.name, parent: base_hostgroup
@@ -53,8 +54,9 @@ module Staypuft
     end
 
     def associate_host
-      deployment = Deployment.find(params[:id])
-      hostgroup  = ::Hostgroup.find params[:hostgroup_id]
+      deployment             = Deployment.find(params[:id])
+      hostgroup              = ::Hostgroup.find params[:hostgroup_id]
+      deployment_in_progress = ForemanTasks::Lock.locked?(deployment, nil)
 
       targeted_hosts  = ::Host::Base.find Array(params[:host_ids])
       assigned_hosts  = hostgroup.hosts
@@ -76,14 +78,40 @@ module Staypuft
       end
 
       hosts_to_remove.each do |host|
-        host.hostgroup = nil
-        host.save!
+        if host.open_stack_deployed? && deployment_in_progress
+          # do not remove
+        else
+          host.hostgroup   = nil
+          host.environment = Environment.get_discovery
+          host.save!
+          host.setBuild
+        end
       end
 
       redirect_to show_with_hostgroup_selected_deployment_path(
                       id: deployment, hostgroup_id: hostgroup)
     end
 
+    def export_config
+      @deployment = Deployment.find(params[:id])
+      send_data DeploymentParamExporter.new(@deployment).to_hash.to_yaml,
+          :type => "application/x-yaml", :disposition => 'attachment',
+          :filename => @deployment.name + '.yml'
+    end
+
+    def import_config
+      @deployment = Deployment.find(params[:id])
+      unless params[:deployment_config_file].nil?
+        new_config = YAML.load_file(params[:deployment_config_file].path)
+        DeploymentParamImporter.new(@deployment).import(new_config)
+
+        flash[:notice] = "Updated parameter values"
+      else
+        flash[:error] = "No import file specified"
+      end
+      redirect_to deployment_path(@deployment)
+    end
+
     private
 
     def assign_host_to_hostgroup(discovered_host, hostgroup)

data/app/controllers/staypuft/steps_controller.rb

@@ -25,7 +25,7 @@ module Staypuft
           @deployment.form_step = Deployment::STEP_SETTINGS unless @deployment.form_complete?
           @deployment.update_attributes(params[:staypuft_deployment])
           @deployment.update_hostgroup_list
-          @deployment.set_networking_params
+          @deployment.set_custom_params
         end
       when :services_selection
         @deployment.form_step = Deployment::STEP_SELECTION unless @deployment.form_complete?

data/app/lib/staypuft/deployment_param_exporter.rb

@@ -0,0 +1,37 @@
+module Staypuft
+  class DeploymentParamExporter
+    def initialize(deployment)
+      @deployment = deployment
+    end
+
+    def to_hash
+      {"deployment" => {"name" => @deployment.name, "services" => services}}
+    end
+
+    def services
+      @deployment.services_hostgroup_map.map { |one_service, hostgroup| service(one_service, hostgroup) }
+    end
+
+    def service(one_service, hostgroup)
+      { 'name' => one_service.name, 'params' => params(one_service, hostgroup) }
+    end
+
+    def params(one_service, hostgroup)
+      one_service.ui_params_for_form(hostgroup).map do |param_hash|
+        param param_hash
+      end
+    end
+
+    def param(param_hash)
+      value = param_hash[:hostgroup].current_param_value_str(param_hash[:param_key])
+      # force encoding needed to prevent to_yaml from outputting some strings as binary
+      value.force_encoding("UTF-8") if value.is_a? String
+
+      { 'key' => param_hash[:param_key].key,
+        'role' => param_hash[:role].name,
+        'puppetclass' => param_hash[:puppetclass].name,
+        'value' => value }
+    end
+
+  end
+end

data/app/lib/staypuft/deployment_param_importer.rb

@@ -0,0 +1,46 @@
+module Staypuft
+  class DeploymentParamImporter
+    def initialize(deployment)
+      @deployment = deployment
+    end
+
+    def import(in_hash)
+      hostgroups = {}
+      puppetclasses = {}
+      deployment_node = in_hash['deployment']
+      unless deployment_node.nil? || (services = deployment_node['services']).nil?
+        services.each do |service_hash|
+          handle_service(service_hash, hostgroups, puppetclasses)
+        end
+      end
+    end
+
+    def handle_service(service_hash, hostgroups, puppetclasses)
+      unless (service_params = service_hash['params']).nil?
+        service_params.each do |param_hash|
+          handle_param(param_hash, hostgroups, puppetclasses)
+        end
+      end
+    end
+
+    def handle_param(param_hash, hostgroups, puppetclasses)
+      hostgroup = hostgroups[param_hash['role']]
+      if hostgroup.nil?
+        drh = DeploymentRoleHostgroup.includes(:hostgroup, :role).
+          where(:deployment_id => @deployment.id,
+                "staypuft_roles.name" => param_hash['role']).first
+        hostgroup = drh.hostgroup unless drh.nil?
+      end
+      puppetclass = (puppetclasses[param_hash['puppetclass']] ||=
+                     Puppetclass.where(:name => param_hash['puppetclass']).first)
+      key = param_hash['key']
+      value = param_hash['value']
+      # skip if either hostgroup or puppetclass are nil
+      unless hostgroup.nil? || puppetclass.nil? || key.nil? || value.nil?
+        hostgroup.set_param_value_if_changed(puppetclass,
+                                             key,
+                                             value)
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ module Staypuft::Concerns::HostgroupExtensions
 
   included do
     has_one :deployment_role_hostgroup, :dependent => :destroy, :class_name => 'Staypuft::DeploymentRoleHostgroup'
-    has_one :parent_deployment, :through => :deployment_role_hostgroup, :class_name => 'Staypuft::Deployment'
+    has_one :parent_deployment, :through => :deployment_role_hostgroup, :class_name => 'Staypuft::Deployment', :source => :deployment
     has_one :role, :through => :deployment_role_hostgroup, :class_name => 'Staypuft::Role'
 
     has_one :deployment, :class_name => 'Staypuft::Deployment', through: :deployment_role_hostgroup

data/app/models/staypuft/deployment.rb

@@ -10,7 +10,14 @@ module Staypuft
 
     NEW_NAME_PREFIX="uninitialized_"
 
-    attr_accessible :description, :name, :layout_id, :layout
+    # amqp providers
+    AMQP_RABBITMQ        = "rabbitmq"
+    AMQP_QPID            = "qpid"
+    AMQP_PROVIDERS       = [AMQP_RABBITMQ, AMQP_QPID]
+    AMQP_PROVIDER_LABELS = {AMQP_RABBITMQ => "RabbitMQ",
+                            AMQP_QPID     => "Qpid" }
+
+    attr_accessible :description, :name, :layout_id, :layout, :amqp_provider
     after_save :update_hostgroup_name
     after_validation :check_form_complete
 
@@ -38,6 +45,8 @@ module Staypuft
     validates :layout, :presence => true
     validates :hostgroup, :presence => true
 
+    validates :amqp_provider, :presence => true, :inclusion => {:in => AMQP_PROVIDERS }
+
     # TODO(mtaylor)
     # Use conditional validations to validate the deployment multi-step form.
     # deployment.form_step should be used to check the form step the user is
@@ -89,9 +98,11 @@ module Staypuft
     # 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
+    def set_custom_params
       child_hostgroups.each do |the_hostgroup|
         the_hostgroup.puppetclasses.each do |pclass|
+
+          # set params relating to neutron/nova networking choice
           if pclass.class_params.where(:key => "include_neutron").first
             the_hostgroup.set_param_value_if_changed(pclass, "include_neutron",
                                                      layout.networking == 'neutron')
@@ -100,6 +111,12 @@ module Staypuft
             the_hostgroup.set_param_value_if_changed(pclass, "neutron",
                                                      layout.networking == 'neutron')
           end
+
+          # set params relating to rabbitmq/qpid amqp choice
+          if pclass.class_params.where(:key => "amqp_server").first
+            the_hostgroup.set_param_value_if_changed(pclass, "amqp_server",
+                                                     amqp_provider)
+          end
         end
       end
     end

data/app/models/staypuft/service/ui_params.rb

@@ -4,13 +4,14 @@
 # just grab the first puppetclass from the matching hostgroup
 
 Staypuft::Service::UI_PARAMS = {
-    'qpid (non-HA)'        => ['qpid_ca',
-                               'qpid_cert',
-                               'qpid_host',
-                               'qpid_username',
-                               'qpid_password',
-                               'qpid_key',
-                               'qpid_nssdb_password'],
+    'AMQP (non-HA)'        => ['amqp_server',
+                               'amqp_host',
+                               'amqp_username',
+                               'amqp_password',
+                               'amqp_ca',
+                               'amqp_cert',
+                               'amqp_key',
+                               'amqp_nssdb_password'],
     'MySQL'                => ['mysql_ca',
                                'mysql_cert',
                                'mysql_host',
@@ -87,7 +88,7 @@ Staypuft::Service::UI_PARAMS = {
     'Cinder (controller)'  => ['cinder_backend_gluster',
                                'cinder_backend_iscsi',
                                'cinder_db_password',
-                               'cinder_gluster_servers',
+                               'cinder_gluster_peers',
                                'cinder_gluster_volume',
                                'cinder_user_password'],
     'Heat'                 => ['heat_cfn',
@@ -96,31 +97,5 @@ Staypuft::Service::UI_PARAMS = {
                                'heat_user_password',
                                'heat_auth_encrypt_key'],
     'Ceilometer'           => ['ceilometer_metering_secret',
-                               'ceilometer_user_password'
-    ],
-    'Neutron - L3'         => ['controller_priv_host',
-                               'enable_tunneling',
-                               'external_network_bridge',
-                               'fixed_network_range',
-                               'mysql_ca',
-                               'mysql_host',
-                               'neutron_db_password',
-                               'neutron_metadata_proxy_secret',
-                               'neutron_user_password',
-                               'nova_db_password',
-                               'nova_user_password',
-                               'qpid_host',
-                               'qpid_username',
-                               'qpid_password',
-                               'ssl',
-                               'tenant_network_type',
-                               'tunnel_id_ranges',
-                               'verbose'],
-    'OVS'                  => ['ovs_bridge_mappings',
-                               'ovs_bridge_uplinks',
-                               'ovs_tunnel_iface',
-                               'ovs_tunnel_network',
-                               'ovs_tunnel_types',
-                               'ovs_vlan_ranges',
-                               'ovs_vxlan_udp_port'] }
+                               'ceilometer_user_password'] }
   

data/app/models/staypuft/service.rb

@@ -13,6 +13,7 @@ module Staypuft
 
     def ui_params_for_form(hostgroup)
       return [] if (hostgroup.nil?)
+      role = hostgroup.role
       if hostgroup.puppetclasses.blank?
         params_from_hash = []
       else
@@ -27,13 +28,17 @@ module Staypuft
           end
           param_lookup_key = param_puppetclass.class_params.where(:key => param_key).first
           param_lookup_key.nil? ? nil : { :hostgroup   => hostgroup,
+                                          :role        => role,
                                           :puppetclass => param_puppetclass,
                                           :param_key   => param_lookup_key }
         end.compact
       end
       params_from_service = self.puppetclasses.collect do |pclass|
         pclass.class_params.collect do |class_param|
-          { :hostgroup => hostgroup, :puppetclass => pclass, :param_key => class_param }
+          { :hostgroup => hostgroup,
+            :role => role,
+            :puppetclass => pclass,
+            :param_key => class_param }
         end
       end.flatten
       params_from_hash + params_from_service

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

@@ -0,0 +1,11 @@
+<%= form_tag(import_config_deployment_path(@deployment.id),
+             multipart: true,
+             class:     'col-md-12',
+             id:        'import_config_form') do |f| %>
+  <%= file_field_tag :deployment_config_file,
+                     class: 'btn btn-default deployment_config_file' %>
+  <br/>
+  <%= submit_tag _("Import Config"), :class => "btn btn-primary btn-sm pull-right" %>
+  <br/>
+  <br/>
+<% end %>

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

@@ -7,7 +7,29 @@
                          else
                            deployment_steps_path(deployment_id: @deployment)
                          end) %>
-  <%= link_to(_("Configuration Summary"), summary_deployment_path(@deployment.id), :class => '') %>
+  <div class="btn-group dropdown keep-open">
+    <button type="button" class="btn btn-default dropdown-toggle" role="button" href="#"
+            data-toggle="dropdown" data-target="#">
+      <%= _('Configuration') %>
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu dropdown keep-open" role="menu">
+      <li><%= link_to(_("Summary"), summary_deployment_path(@deployment.id), :class => '') %></li>
+      <li>
+        <%= link_to(icon_text("cloud-upload", _("Import")),
+                    {},
+                    { :remote => true,
+                      :rel    => 'popover',
+                      :data   => { 'content'        => "#{render partial: 'import_form'}",
+                                   'original-title' => _('Import Config'),
+                                   'placement'      => 'left', } }) %>
+      </li>
+      <li>
+        <%= link_to(icon_text("cloud-download", _("Export")),
+                    export_config_deployment_path(@deployment.id)) %>
+      </li>
+    </ul>
+  </div>
 
   <% if Rails.env.development? %>
     <div class="btn-group">
@@ -41,6 +63,8 @@
                 :'data-toggle' => "modal",
                 :'data-target' => "#deploy_modal") %>
   <% end %>
+
+
   <%= help_path %>
 <% end %>
 
@@ -86,20 +110,25 @@
                     <%= check_box_tag :check_all %>
                   </th>
                   <th><%= sort :name, :as => _('Name') %></th>
+                  <th class="hidden-s hidden-xs"><%= _('Deployed?') %></th>
                   <th class="hidden-s hidden-xs"><%= sort :mac, :as => _('MAC Address') %></th>
                   <th class="hidden-s hidden-xs"><%= sort :type, :as => _('Type') %></th>
                 </tr>
               </thead>
               <tbody>
                 <% child_hostgroup.own_and_free_hosts.each do |host| %>
-                  <tr class="checkbox_highlight <%= "success" if child_hostgroup.host_ids.include?(host.id) %>">
+                  <tr class="<%= ['checkbox_highlight',
+                                  ('success' if child_hostgroup.host_ids.include?(host.id)),
+                                  ('deployed' if host.open_stack_deployed?)
+                                 ].compact.join(' ') %>">
                     <td class="ca">
+                      <% disabled = ForemanTasks::Lock.locked?(@deployment, nil) && host.open_stack_deployed? %>
                       <%= check_box_tag 'host_ids[]',
                                         host.id,
                                         child_hostgroup.host_ids.include?(host.id),
-                                        :id       => "host_ids_#{host.id}",
-                                        :disabled => host.open_stack_deployed? %>
-                      <%= hidden_field_tag 'host_ids[]', host.id if host.open_stack_deployed? %>
+                                        id:       "host_ids_#{host.id}",
+                                        disabled: disabled %>
+                      <%= hidden_field_tag 'host_ids[]', host.id if disabled %>
                     </td>
                     <td class="ellipsis">
                       <% case host %>
@@ -111,6 +140,13 @@
                         <%= host.name %>
                       <% end %>
                     </td>
+                    <td class="hidden-s hidden-xs">
+                      <% if host.open_stack_deployed? %>
+                        <span class="glyphicon glyphicon-cloud"></span>
+                      <% else %>
+                        <span class="glyphicon glyphicon-minus"></span>
+                      <% end %>
+                    </td>
                     <td class="hidden-s hidden-xs"><%= host.mac %></td>
                     <td class="hidden-s hidden-xs"><%= host.type %></td>
                   </tr>
@@ -148,9 +184,9 @@
         <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
         <%= display_link_if_authorized(_("Deploy"),
                                        hash_for_deploy_deployment_path,
-                                       :class => 'btn btn-primary',
+                                       :class  => 'btn btn-primary',
                                        :method => :post,
-                                       :data => { :disable_with => _("Deploying...")}) %>
+                                       :data   => { :disable_with => _("Deploying...") }) %>
       </div>
     </div>
   </div>

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

@@ -21,6 +21,14 @@
             <% end %>
           </div>
         </div>
+        <div class="form-group">
+          <label class="col-md-2 control-label" for="layout_id"><%= _("AMQP Provider") %></label>
+          <div class="col-md-6">
+            <% Staypuft::Deployment::AMQP_PROVIDER_LABELS.each do |provider_value, provider_label| %>
+              <%= radio_button_f_non_inline(f, :amqp_provider, :checked => provider_value == @deployment.amqp_provider,:value=>provider_value, :text=> provider_label) %>
+            <% end %>
+          </div>
+        </div>
       </div>
     </div>
 

data/config/routes.rb

@@ -12,6 +12,8 @@ Rails.application.routes.draw do
         get 'populate'
         get 'summary'
         post 'associate_host'
+        get 'export_config'
+        post 'import_config'
       end
 
       resources :steps

data/db/migrate/20140602121501_add_amqp_provider_to_staypuft_deployment.rb

@@ -0,0 +1,13 @@
+class AddAmqpProviderToStaypuftDeployment < ActiveRecord::Migration
+  Deployment = Class.new(ActiveRecord::Base) do
+    self.table_name = 'staypuft_deployments'
+  end
+
+  def change
+    add_column :staypuft_deployments, :amqp_provider, :string
+
+    Deployment.update_all :amqp_provider => 'rabbitmq'
+
+    change_column :staypuft_deployments, :amqp_provider, :string, :null => false
+  end
+end

data/db/seeds.rb

@@ -67,9 +67,10 @@ params = {
     'mysql_shared_storage_type'     => 'nfs',
     'mysql_resource_group_name'     => 'mysqlgrp',
     'mysql_clu_member_addrs'        => '192.168.203.11 192.168.203.12 192.168.203.13',
-    'qpid_host'                     => '172.16.0.1',
-    'qpid_username'                 => 'openstack',
-    'qpid_password'                 => SecureRandom.hex,
+    "amqp_server"                   => 'rabbitmq',
+    'amqp_host'                     => '172.16.0.1',
+    'amqp_username'                 => 'openstack',
+    'amqp_password'                 => SecureRandom.hex,
     'admin_email'                   => "admin@#{Facter.value(:domain)}",
     'neutron_metadata_proxy_secret' => SecureRandom.hex,
     'enable_ovs_agent'              => 'true',
@@ -100,15 +101,17 @@ params = {
     'mysql_ca'                      => '/etc/ipa/ca.crt',
     'mysql_cert'                    => '/etc/pki/tls/certs/PRIV_HOST-mysql.crt',
     'mysql_key'                     => '/etc/pki/tls/private/PRIV_HOST-mysql.key',
-    'qpid_ca'                       => '/etc/ipa/ca.crt',
-    'qpid_cert'                     => '/etc/pki/tls/certs/PRIV_HOST-qpid.crt',
-    'qpid_key'                      => '/etc/pki/tls/private/PRIV_HOST-qpid.key',
+    'amqp_ca'                       => '/etc/ipa/ca.crt',
+    'amqp_cert'                     => '/etc/pki/tls/certs/PRIV_HOST-amqp.crt',
+    'amqp_key'                      => '/etc/pki/tls/private/PRIV_HOST-amqp.key',
     'horizon_ca'                    => '/etc/ipa/ca.crt',
     'horizon_cert'                  => '/etc/pki/tls/certs/PUB_HOST-horizon.crt',
     'horizon_key'                   => '/etc/pki/tls/private/PUB_HOST-horizon.key',
-    'qpid_nssdb_password'           => SecureRandom.hex,
+    'amqp_nssdb_password'           => SecureRandom.hex,
     'fence_xvm_key_file_password'   => SecureRandom.hex,
     'use_qemu_for_poc'              => 'false',
+    'secret_key'                    => SecureRandom.hex,
+    'admin_token'                   => SecureRandom.hex,
 }
 
 get_key_type = lambda do |value|
@@ -137,7 +140,7 @@ layouts      = {
 
 # services don't have puppetclasses yet, since they aren't broken out on the back end
 services     = {
-    :non_ha_qpid        => { :name => 'qpid (non-HA)', :class => [] },
+    :non_ha_amqp        => { :name => 'AMQP (non-HA)', :class => [] },
     :mysql              => { :name => 'MySQL', :class => [] },
     :non_ha_keystone    => { :name => 'Keystone (non-HA)', :class => [] },
     :nova_controller    => { :name => 'Nova (Controller)', :class => [] },
@@ -147,8 +150,7 @@ services     = {
     :cinder_node        => { :name => 'Cinder (node)', :class => ['quickstack::storage_backend::lvm_cinder'] },
     :heat               => { :name => 'Heat', :class => [] },
     :ceilometer         => { :name => 'Ceilometer', :class => [] },
-    :neutron_l3         => { :name => 'Neutron - L3', :class => [] },
-    :ovs                => { :name => 'OVS', :class => [] },
+    :neutron_networker  => { :name => 'Neutron Networker', :class => ['quickstack::neutron::networker'] },
     :nova_compute       => { :name => 'Nova-compute', :class => ['quickstack::nova_network::compute'] },
     :neutron_compute    => { :name => 'Neutron-compute', :class => ['quickstack::neutron::compute'] },
     :swift              => { :name => 'Swift (node)', :class => ['quickstack::swift::storage'] },
@@ -207,7 +209,7 @@ roles = [
     { :name     => 'Controller (Nova)',
       :class    => 'quickstack::nova_network::controller',
       :layouts  => [[:non_ha_nova, 1]],
-      :services => [:non_ha_qpid, :mysql, :non_ha_keystone, :nova_controller, :non_ha_glance,
+      :services => [:non_ha_amqp, :mysql, :non_ha_keystone, :nova_controller, :non_ha_glance,
                     :cinder_controller, :heat, :ceilometer] },
     { :name     => 'Compute (Nova)',
       :class    => [],
@@ -216,17 +218,17 @@ roles = [
     { :name     => 'Controller (Neutron)',
       :class    => 'quickstack::neutron::controller',
       :layouts  => [[:non_ha_neutron, 1]],
-      :services => [:non_ha_qpid, :mysql, :non_ha_keystone, :neutron_controller, :non_ha_glance,
+      :services => [:non_ha_amqp, :mysql, :non_ha_keystone, :neutron_controller, :non_ha_glance,
                     :cinder_controller, :heat, :ceilometer] },
     { :name     => 'Compute (Neutron)',
       :class    => [],
       :layouts  => [[:ha_neutron, 10], [:non_ha_neutron, 10]],
       :services => [:neutron_compute] },
     { :name     => 'Neutron Networker',
-      :class    => 'quickstack::neutron::networker',
+      :class    => [],
       :layouts  => [[:non_ha_neutron, 3]],
-      :services => [:neutron_l3, :ovs] },
-    { :name     => 'LVM Block Storage',
+      :services => [:neutron_networker] },
+    { :name     => 'Cinder Block Storage',
       :class    => [],
       :layouts  => [[:ha_nova, 2], [:ha_neutron, 2], [:non_ha_nova, 2], [:non_ha_neutron, 2]],
       :services => [:cinder_node] },

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.0.16'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.16
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-06-04 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,69 +73,73 @@ 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/deployments_controller.rb
-- app/controllers/staypuft/steps_controller.rb
+- app/overrides/hide_subscription_manager_passwords.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/ui_params.rb
-- app/models/staypuft/service.rb
-- app/models/staypuft/service_class.rb
-- app/overrides/hide_subscription_manager_passwords.rb
+- app/models/staypuft/role.rb
+- app/models/setting/staypuft_provisioning.rb
+- app/lib/staypuft/deployment_param_importer.rb
+- app/lib/staypuft/exception.rb
+- app/lib/staypuft/deployment_param_exporter.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/steps_controller.rb
+- app/controllers/staypuft/deployments_controller.rb
+- app/controllers/staypuft/application_controller.rb
 - app/views/staypuft/deployments/index.html.erb
 - app/views/staypuft/deployments/show.html.erb
+- app/views/staypuft/deployments/_import_form.html.erb
 - app/views/staypuft/deployments/summary.html.erb
 - app/views/staypuft/layouts/staypuft.html.erb
-- app/views/staypuft/steps/_title.html.erb
 - app/views/staypuft/steps/deployment_settings.html.erb
-- app/views/staypuft/steps/services_configuration.html.erb
 - app/views/staypuft/steps/services_selection.html.erb
-- config/routes.rb
+- app/views/staypuft/steps/_title.html.erb
+- app/views/staypuft/steps/services_configuration.html.erb
 - 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/20140602121501_add_amqp_provider_to_staypuft_deployment.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/20140507103716_add_form_step_to_staypuft_deployment.rb
 - db/migrate/20140513124807_change_column_default_form_step_on_staypuft_deployment.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
@@ -153,40 +148,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