staypuft 0.1.11 → 0.1.17

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjMyMjI1NjU5ZDUzZDQwMTM3NTYwMGJkNDEwZWU3ZDk4MWM2NjkxOA==
-  data.tar.gz: !binary |-
-    YjVkNzI2YTc3YWE5MzZhYTcwMDJhYjhhNmIzMjNhYTQwYjNjMzFiMg==
+SHA1:
+  metadata.gz: 3386cee555561d013c4968867cb54660088bba35
+  data.tar.gz: a2ac68c76e051ea923e3998ccaa220ec50642597
 SHA512:
-  metadata.gz: !binary |-
-    NmZlNTAwZTcwODIxMDczYzMxZTE0OTY1NjE3OTI5YjlmNjU0YmM4ZGNjZjEx
-    MTRkMDQ5NjJlMTk1MjZkNTQ5NmFmNmIwMTNjNzcyNjdhYzFiMDk0ZjgwMGMw
-    ZDZmM2VlNDczNzBmOGI5MzFmZTBhNmJkMDY3YWYxYmZmZWI2MDk=
-  data.tar.gz: !binary |-
-    ZmE3ZGE4MDYwMTllZWY3OGExMDY1MTA1N2MyZTIwZjBkMWYxMGVhZGFkMmI0
-    NDcwY2Q1OTNkMTVmMDUyMWM1MjY0MWY0MzUwOGU0NGQ0NWQxZDQ4ZjIyMTEx
-    YTNkZWQxOTg1OGViMWIyZDc3NWMzYzM4M2ZhNzIxMWRiMTRlMDg=
+  metadata.gz: 72bd5a3ba9c0fe7fb6e9817aec46b6c1c56195273bc41497a3b09f2b7505e6c737eae5c52bcd92a2a0929be4a79967d8d4ef374608c9e0fd73d91972746753f8
+  data.tar.gz: 7526c87be767c0b690aa8960565ab975c1f737d5453fdc9552f40e14636492441202068b254c7109c03d1ca4ae5ea96dbb094f9a22a41ed80f91b1d7ac4dc34c

data/app/controllers/staypuft/deployments_controller.rb

@@ -15,8 +15,13 @@ module Staypuft
 
     def show
       @deployment = Deployment.find(params[:id])
-      @hostgroup  = ::Hostgroup.find_by_id(params[:hostgroup_id]) ||
-          @deployment.child_hostgroups.deploy_order.first
+      respond_to do | format |
+        format.html do
+          @hostgroup  = ::Hostgroup.find_by_id(params[:hostgroup_id]) ||
+              @deployment.child_hostgroups.deploy_order.first
+        end
+        format.js {}
+      end
     end
 
     def summary

data/app/controllers/staypuft/steps_controller.rb

@@ -9,6 +9,10 @@ module Staypuft
       case step
       when :deployment_settings
         @layouts = ordered_layouts
+      when :services_overview
+        if !@deployment.ha? && @deployment.cinder.lvm_ptable.nil?
+          flash[:warning] = "Missing Partition Table 'LVM with cinder-volumes', LVM cinder backend won't work." 
+        end
       when :services_configuration
         @services_map = [:nova, :neutron, :glance, :cinder]
       end

data/app/lib/staypuft/deployment_param_exporter.rb

@@ -1,11 +1,41 @@
 module Staypuft
   class DeploymentParamExporter
+
+    NAME = :name
+    DESCRIPTION = :description
+    UI_PARAMS = "ui_params"
+
+    PUPPET_PARAMS  = "puppet_params"
+    SERVICES       = "services"
+    SERVICE_NAME   = "name"
+    SERVICE_PARAMS = "params"
+
+    PARAM_KEY         = "key"
+    PARAM_ROLE        = "role"
+    PARAM_PUPPETCLASS = "puppetclass"
+    PARAM_VALUE       = "value"
     def initialize(deployment)
       @deployment = deployment
     end
 
     def to_hash
-      {"deployment" => {"name" => @deployment.name, "services" => services}}
+      {"deployment" => {NAME.to_s          => @deployment.send(NAME),
+                        DESCRIPTION.to_s   => @deployment.send(DESCRIPTION),
+                        UI_PARAMS          => ui_params,
+                        PUPPET_PARAMS      => puppet_params} }
+    end
+
+    def ui_params
+      param_hash = {}
+      services_hash = {}
+      Deployment::EXPORT_PARAMS.each {|param| param_hash[param.to_s] = @deployment.send(param)}
+      Deployment::EXPORT_SERVICES.each {|param| services_hash[param.to_s] = @deployment.send(param).param_hash}
+      param_hash[SERVICES.to_s] = services_hash
+      param_hash
+    end
+
+    def puppet_params
+      { SERVICES => services }
     end
 
     def services
@@ -13,7 +43,7 @@ module Staypuft
     end
 
     def service(one_service, hostgroup)
-      { 'name' => one_service.name, 'params' => params(one_service, hostgroup) }
+      { SERVICE_NAME => one_service.name, SERVICE_PARAMS => params(one_service, hostgroup) }
     end
 
     def params(one_service, hostgroup)
@@ -27,10 +57,10 @@ module Staypuft
       # 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 }
+      { PARAM_KEY         => param_hash[:param_key].key,
+        PARAM_ROLE        => param_hash[:role].name,
+        PARAM_PUPPETCLASS => param_hash[:puppetclass].name,
+        PARAM_VALUE       => value }
     end
 
   end

data/app/lib/staypuft/deployment_param_importer.rb

@@ -10,15 +10,47 @@ module Staypuft
       if !in_hash.is_a?(Hash) || ((deployment_node = in_hash['deployment']).nil?)
         raise ArgumentError, "Invalid import file: no 'deployment' node found"
       end
-      unless deployment_node.nil? || (services = deployment_node['services']).nil?
-        services.each do |service_hash|
-          handle_service(service_hash, hostgroups, puppetclasses)
+      # We don't import name/description to avoid conflict with existing deployments
+      if (ui_params = deployment_node[DeploymentParamExporter::UI_PARAMS])
+        handle_obj_params(ui_params, @deployment, Deployment::EXPORT_PARAMS)
+        if (ui_services = ui_params[DeploymentParamExporter::SERVICES])
+          handle_ui_services(ui_services, @deployment,  Deployment::EXPORT_SERVICES)
+        end
+      end
+      @deployment.save!
+
+      handle_services(deployment_node, hostgroups, puppetclasses)
+    end
+
+    def handle_ui_services(services_node, obj, service_list)
+      service_list.each do |service_name|
+        if (service_node = services_node[service_name.to_s])
+          service_obj = obj.send(service_name)
+          handle_obj_params(service_node, service_obj, service_obj.param_hash.keys)
+        end
+      end
+    end
+
+    def handle_obj_params(node, obj, param_list)
+      param_list.each do |param_name|
+        param_value = node[param_name.to_s]
+        obj.send(param_name.to_s+"=",param_value) if param_value
+      end
+    end
+
+    def handle_services(deployment_node, hostgroups, puppetclasses)
+      unless deployment_node.nil? || (puppet_params = deployment_node[DeploymentParamExporter::PUPPET_PARAMS]).nil?
+        services = puppet_params[DeploymentParamExporter::SERVICES]
+        if services
+          services.each do |service_hash|
+            handle_service(service_hash, hostgroups, puppetclasses)
+          end
         end
       end
     end
 
     def handle_service(service_hash, hostgroups, puppetclasses)
-      unless (service_params = service_hash['params']).nil?
+      unless (service_params = service_hash[DeploymentParamExporter::SERVICE_PARAMS]).nil?
         service_params.each do |param_hash|
           handle_param(param_hash, hostgroups, puppetclasses)
         end
@@ -26,17 +58,17 @@ module Staypuft
     end
 
     def handle_param(param_hash, hostgroups, puppetclasses)
-      hostgroup = hostgroups[param_hash['role']]
+      hostgroup = hostgroups[param_hash[DeploymentParamExporter::PARAM_ROLE]]
       if hostgroup.nil?
         drh = DeploymentRoleHostgroup.includes(:hostgroup, :role).
           where(:deployment_id => @deployment.id,
-                "staypuft_roles.name" => param_hash['role']).first
+                "staypuft_roles.name" => param_hash[DeploymentParamExporter::PARAM_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']
+      puppetclass = (puppetclasses[param_hash[DeploymentParamExporter::PARAM_PUPPETCLASS]] ||=
+                     Puppetclass.where(:name => param_hash[DeploymentParamExporter::PARAM_PUPPETCLASS]).first)
+      key = param_hash[DeploymentParamExporter::PARAM_KEY]
+      value = param_hash[DeploymentParamExporter::PARAM_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,

data/app/lib/staypuft/seeder.rb

@@ -21,11 +21,6 @@ module Staypuft
         'swift_ext4_device'            => '/dev/sdc2',
         'swift_local_interface'        => 'eth3',
         'swift_loopback'               => true,
-        'swift_ring_server'            => '192.168.203.1',
-        'controller_admin_host'        => '172.16.0.1',
-        'controller_priv_host'         => '172.16.0.1',
-        'controller_pub_host'          => '172.16.1.1',
-        'mysql_host'                   => '172.16.0.1',
         'mysql_virtual_ip'             => '192.168.200.220',
         'mysql_bind_address'           => '0.0.0.0',
         'mysql_virt_ip_nic'            => 'eth1',
@@ -34,7 +29,6 @@ module Staypuft
         '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',
-        'amqp_host'                    => '172.16.0.1',
         'amqp_username'                => 'openstack',
         'admin_email'                  => "admin@#{Facter.value(:domain)}",
         'enable_ovs_agent'             => 'true',
@@ -43,14 +37,12 @@ module Staypuft
         'auto_assign_floating_ip'      => 'true',
         'cisco_vswitch_plugin'         => 'neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2',
         'cisco_nexus_plugin'           => 'neutron.plugins.cisco.nexus.cisco_nexus_plugin_v2.NexusPlugin',
-        'nexus_config'                 => {},
+        'nexus_config'                 => { :hash => {}},
         'nexus_credentials'            => [],
         'provider_vlan_auto_create'    => 'false',
         'provider_vlan_auto_trunk'     => 'false',
         'backend_server_names'         => [],
         'backend_server_addrs'         => [],
-        'lb_backend_server_names'      => [],
-        'lb_backend_server_addrs'      => [],
         'configure_ovswitch'           => 'true',
         'neutron'                      => 'false',
         'ssl'                          => 'false',
@@ -160,45 +152,54 @@ module Staypuft
 
     CONTROLLER_ROLES = ROLES.select { |h| h.fetch(:name) =~ /Controller/ }
 
+    def get_host_format(param_name)
+      { :string => '<%%= d = @host.deployment; d.ha? ? d.vips.get(:%s) : d.ips.controller_ip %%>' % param_name }
+    end
+
+    # virtual ip addresses
+    def vip_format(param_name)
+      { :string => '<%%= @host.deployment.vips.get(:%s) %%>' % param_name }
+    end
 
     def functional_dependencies
-      amqp_provider               = '<%= @host.deployment.amqp_provider %>'
-      neutron                     = '<%= @host.deployment.neutron_networking? %>'
+      amqp_provider               = { :string => '<%= @host.deployment.amqp_provider %>' }
+      neutron                     = { :string => '<%= @host.deployment.neutron_networking? %>' }
+      ceilometer                  = { :string => '<%= @host.deployment.non_ha? %>' }
 
       # Nova
-      network_manager             = '<%= @host.deployment.nova.network_manager %>'
+      network_manager             = { :string => '<%= @host.deployment.nova.network_manager %>' }
       # multi_host handled inline, since it's two separate static values 'true' and 'True'
-      network_overrides           = '<%= @host.deployment.nova.network_overrides %>'
-      network_num_networks        = '<%= @host.deployment.nova.num_networks %>'
-      network_fixed_range         = '<%= @host.deployment.nova.private_fixed_range %>'
-      network_floating_range      = '<%= @host.deployment.nova.public_floating_range %>'
-      network_private_iface       = '<%= @host.deployment.nova.compute_tenant_interface %>'
-      network_public_iface        = '<%= @host.deployment.nova.external_interface_name %>'
+      network_overrides           = { :hash =>   '<%= @host.deployment.nova.network_overrides %>' }
+      network_num_networks        = { :string => '<%= @host.deployment.nova.num_networks %>' }
+      network_fixed_range         = { :string => '<%= @host.deployment.nova.private_fixed_range %>' }
+      network_floating_range      = { :string => '<%= @host.deployment.nova.public_floating_range %>' }
+      network_private_iface       = { :string => '<%= @host.deployment.nova.compute_tenant_interface %>' }
+      network_public_iface        = { :string => '<%= @host.deployment.nova.external_interface_name %>' }
       network_create_networks     = true
 
       # Neutron
-      ovs_vlan_ranges             = '<%= @host.deployment.neutron.networker_vlan_ranges %>'
-      compute_ovs_vlan_ranges     = '<%= @host.deployment.neutron.compute_vlan_ranges %>'
+      ovs_vlan_ranges             = { :array =>  '<%= @host.deployment.neutron.networker_vlan_ranges %>' }
+      compute_ovs_vlan_ranges     = { :array =>  '<%= @host.deployment.neutron.compute_vlan_ranges %>' }
       ml2_network_vlan_ranges     = ovs_vlan_ranges
       ml2_tenant_network_types    = ['<%= @host.deployment.neutron.network_segmentation %>']
       ml2_tunnel_id_ranges        = ['10:100000']
       ml2_vni_ranges              = ['10:100000']
       ovs_tunnel_types            = ['vxlan', 'gre']
-      ovs_tunnel_iface            = '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.networker_tenant_interface : "" %>'
-      ovs_bridge_mappings         = '<%= @host.deployment.neutron.networker_ovs_bridge_mappings %>'
-      ovs_bridge_uplinks          = '<%= @host.deployment.neutron.networker_ovs_bridge_uplinks %>'
-      compute_ovs_tunnel_iface    = '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.compute_tenant_interface : "" %>'
-      compute_ovs_bridge_mappings = '<%= @host.deployment.neutron.compute_ovs_bridge_mappings %>'
-      compute_ovs_bridge_uplinks  = '<%= @host.deployment.neutron.compute_ovs_bridge_uplinks %>'
-      enable_tunneling            = '<%= @host.deployment.neutron.enable_tunneling?.to_s %>'
+      ovs_tunnel_iface            = { :string => '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.networker_tenant_interface : "" %>' }
+      ovs_bridge_mappings         = { :array =>  '<%= @host.deployment.neutron.networker_ovs_bridge_mappings %>' }
+      ovs_bridge_uplinks          = { :array =>  '<%= @host.deployment.neutron.networker_ovs_bridge_uplinks %>' }
+      compute_ovs_tunnel_iface    = { :string => '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.compute_tenant_interface : "" %>' }
+      compute_ovs_bridge_mappings = { :array =>  '<%= @host.deployment.neutron.compute_ovs_bridge_mappings %>' }
+      compute_ovs_bridge_uplinks  = { :array =>  '<%= @host.deployment.neutron.compute_ovs_bridge_uplinks %>' }
+      enable_tunneling            = { :string => '<%= @host.deployment.neutron.enable_tunneling?.to_s %>' }
 
       # Glance
       backend                     = 'file'
-      pcmk_fs_type                = '<%= @host.deployment.glance.driver_backend %>'
-      pcmk_fs_device              = '<%= @host.deployment.glance.pcmk_fs_device %>'
-      pcmk_fs_dir                 = '<%= @host.deployment.glance.pcmk_fs_dir %>'
+      pcmk_fs_type                = { :string => '<%= @host.deployment.glance.driver_backend %>' }
+      pcmk_fs_device              = { :string => '<%= @host.deployment.glance.pcmk_fs_device %>' }
+      pcmk_fs_dir                 = '/var/lib/glance/images'
       pcmk_fs_manage              = 'true'
-      pcmk_fs_options             = '<%= @host.deployment.glance.pcmk_fs_options %>'
+      pcmk_fs_options             = { :string => '<%= @host.deployment.glance.pcmk_fs_options %>' }
       glance_rbd_store_user       = 'glance'
       glance_rbd_store_pool       = 'images' 
 
@@ -206,15 +207,15 @@ module Staypuft
       volume                      = true
       cinder_backend_gluster      = false
       cinder_backend_gluster_name = 'gluster_backend'
-      cinder_backend_iscsi        = '<%= @host.deployment.cinder.lvm_backend? %>'
+      cinder_backend_iscsi        = { :string => '<%= @host.deployment.cinder.lvm_backend? %>' }
       cinder_backend_iscsi_name   = 'iscsi_backend'
-      cinder_backend_nfs          = '<%= @host.deployment.cinder.nfs_backend? %>'
+      cinder_backend_nfs          = { :string => '<%= @host.deployment.cinder.nfs_backend? %>' }
       cinder_backend_nfs_name     = 'nfs_backend'
       cinder_multiple_backends    = false
       cinder_nfs_shares           = ['<%= @host.deployment.cinder.nfs_uri %>']
       cinder_nfs_mount_options    = ''
 
-      cinder_backend_rbd                      = '<%= @host.deployment.cinder.ceph_backend? %>'
+      cinder_backend_rbd                      = { :string => '<%= @host.deployment.cinder.ceph_backend? %>' }
       cinder_backend_rbd_name                 = 'rbd_backend'
       # TODO: confirm these params and add them to model where user input is needed
       cinder_rbd_pool                         = 'volumes'
@@ -224,7 +225,7 @@ module Staypuft
       cinder_rbd_user                         = 'cinder'
       cinder_rbd_secret_uuid                  = ''
 
-      cinder_backend_eqlx           = '<%= @host.deployment.cinder.equallogic_backend? %>'
+      cinder_backend_eqlx           = { :string => '<%= @host.deployment.cinder.equallogic_backend? %>' }
       cinder_backend_eqlx_name      = ['eqlx_backend']
       # TODO: confirm these params and add them to model where user input is needed
       # below dynamic calls are commented out since the model does not yet have san/chap entries
@@ -241,47 +242,44 @@ module Staypuft
 
       # effective_value grabs shared password if deployment is in shared password mode,
       # otherwise use the service-specific one
-      admin_pw                      = '<%= @host.deployment.passwords.effective_value(:admin) %>'
-      ceilometer_user_pw            = '<%= @host.deployment.passwords.effective_value(:ceilometer_user) %>'
-      cinder_db_pw                  = '<%= @host.deployment.passwords.effective_value(:cinder_db) %>'
-      cinder_user_pw                = '<%= @host.deployment.passwords.effective_value(:cinder_user) %>'
-      glance_db_pw                  = '<%= @host.deployment.passwords.effective_value(:glance_db) %>'
-      glance_user_pw                = '<%= @host.deployment.passwords.effective_value(:glance_user) %>'
-      heat_db_pw                    = '<%= @host.deployment.passwords.effective_value(:heat_db) %>'
-      heat_user_pw                  = '<%= @host.deployment.passwords.effective_value(:heat_user) %>'
-      heat_cfn_user_pw              = '<%= @host.deployment.passwords.effective_value(:heat_cfn_user) %>'
-      keystone_db_pw                = '<%= @host.deployment.passwords.effective_value(:keystone_db) %>'
-      keystone_user_pw              = '<%= @host.deployment.passwords.effective_value(:keystone_user) %>'
-      mysql_root_pw                 = '<%= @host.deployment.passwords.effective_value(:mysql_root) %>'
-      neutron_db_pw                 = '<%= @host.deployment.passwords.effective_value(:neutron_db) %>'
-      neutron_user_pw               = '<%= @host.deployment.passwords.effective_value(:neutron_user) %>'
-      nova_db_pw                    = '<%= @host.deployment.passwords.effective_value(:nova_db) %>'
-      nova_user_pw                  = '<%= @host.deployment.passwords.effective_value(:nova_user) %>'
-      swift_admin_pw                = '<%= @host.deployment.passwords.effective_value(:swift_admin) %>'
-      swift_user_pw                 = '<%= @host.deployment.passwords.effective_value(:swift_user) %>'
-      amqp_pw                       = '<%= @host.deployment.passwords.effective_value(:amqp) %>'
-      amqp_nssdb_pw                 = '<%= @host.deployment.passwords.effective_value(:amqp_nssdb) %>'
-      keystone_admin_token          = '<%= @host.deployment.passwords.effective_value(:keystone_admin_token) %>'
+      admin_pw                      = { :string => '<%= @host.deployment.passwords.effective_value(:admin) %>' }
+      ceilometer_user_pw            = { :string => '<%= @host.deployment.passwords.effective_value(:ceilometer_user) %>' }
+      cinder_db_pw                  = { :string => '<%= @host.deployment.passwords.effective_value(:cinder_db) %>' }
+      cinder_user_pw                = { :string => '<%= @host.deployment.passwords.effective_value(:cinder_user) %>' }
+      glance_db_pw                  = { :string => '<%= @host.deployment.passwords.effective_value(:glance_db) %>' }
+      glance_user_pw                = { :string => '<%= @host.deployment.passwords.effective_value(:glance_user) %>' }
+      heat_db_pw                    = { :string => '<%= @host.deployment.passwords.effective_value(:heat_db) %>' }
+      heat_user_pw                  = { :string => '<%= @host.deployment.passwords.effective_value(:heat_user) %>' }
+      heat_cfn_user_pw              = { :string => '<%= @host.deployment.passwords.effective_value(:heat_cfn_user) %>' }
+      keystone_db_pw                = { :string => '<%= @host.deployment.passwords.effective_value(:keystone_db) %>' }
+      keystone_user_pw              = { :string => '<%= @host.deployment.passwords.effective_value(:keystone_user) %>' }
+      mysql_root_pw                 = { :string => '<%= @host.deployment.passwords.effective_value(:mysql_root) %>' }
+      neutron_db_pw                 = { :string => '<%= @host.deployment.passwords.effective_value(:neutron_db) %>' }
+      neutron_user_pw               = { :string => '<%= @host.deployment.passwords.effective_value(:neutron_user) %>' }
+      nova_db_pw                    = { :string => '<%= @host.deployment.passwords.effective_value(:nova_db) %>' }
+      nova_user_pw                  = { :string => '<%= @host.deployment.passwords.effective_value(:nova_user) %>' }
+      swift_admin_pw                = { :string => '<%= @host.deployment.passwords.effective_value(:swift_admin) %>' }
+      swift_user_pw                 = { :string => '<%= @host.deployment.passwords.effective_value(:swift_user) %>' }
+      amqp_pw                       = { :string => '<%= @host.deployment.passwords.effective_value(:amqp) %>' }
+      amqp_nssdb_pw                 = { :string => '<%= @host.deployment.passwords.effective_value(:amqp_nssdb) %>' }
+      keystone_admin_token          = { :string => '<%= @host.deployment.passwords.effective_value(:keystone_admin_token) %>' }
 
       #these don't share the user-supplied password value; they're always a random per param value
-      ceilometer_metering           = '<%= @host.deployment.passwords.ceilometer_metering_secret %>'
-      heat_auth_encrypt_key         = '<%= @host.deployment.passwords.heat_auth_encrypt_key %>'
-      horizon_secret_key            = '<%= @host.deployment.passwords.horizon_secret_key %>'
-      swift_shared_secret           = '<%= @host.deployment.passwords.swift_shared_secret %>'
-      neutron_metadata_proxy_secret = '<%= @host.deployment.passwords.neutron_metadata_proxy_secret %>'
+      ceilometer_metering           = { :string => '<%= @host.deployment.passwords.ceilometer_metering_secret %>' }
+      heat_auth_encrypt_key         = { :string => '<%= @host.deployment.passwords.heat_auth_encrypt_key %>' }
+      horizon_secret_key            = { :string => '<%= @host.deployment.passwords.horizon_secret_key %>' }
+      swift_shared_secret           = { :string => '<%= @host.deployment.passwords.swift_shared_secret %>' }
+      neutron_metadata_proxy_secret = { :string => '<%= @host.deployment.passwords.neutron_metadata_proxy_secret %>' }
 
-      # virtual ip addresses
-      vip_format                    = '<%%= @host.deployment.vips.get(:%s) %%>'
-      get_host_format               = '<%%= d = @host.deployment; d.ha? ? d.vips.get(:%s) : d.ips.controller_ip %%>'
 
-      amqp_host    = get_host_format % :amqp
-      mysql_host   = get_host_format % :db
-      glance_host  = get_host_format % :glance
-      auth_host    = get_host_format % :keystone
-      neutron_host = get_host_format % :neutron
-      nova_host    = get_host_format % :nova
+      amqp_host    = get_host_format :amqp
+      mysql_host   = get_host_format :db
+      glance_host  = get_host_format :glance
+      auth_host    = get_host_format :keystone
+      neutron_host = get_host_format :neutron
+      nova_host    = get_host_format :nova
 
-      controller_host = '<%= d = @host.deployment; d.ha? ? nil : d.ips.controller_ip %>'
+      controller_host = { :string => '<%= d = @host.deployment; d.ha? ? nil : d.ips.controller_ip %>'}
 
       {
           'quickstack::nova_network::controller'   => {
@@ -340,7 +338,7 @@ module Staypuft
               'mysql_host'                              => mysql_host,
               'swift_shared_secret'                     => swift_shared_secret,
               'swift_ringserver_ip'                     => '',
-              'swift_storage_ips'                       => '<%= @host.deployment.ips.controller_ips %>',
+              'swift_storage_ips'                       => { :array => '<%= @host.deployment.ips.controller_ips %>' },
               'cinder_nfs_shares'                       => [],
               'cinder_gluster_shares'                   => [],
               'controller_admin_host'                   => controller_host,
@@ -412,13 +410,14 @@ module Staypuft
               'mysql_host'                              => mysql_host,
               'swift_shared_secret'                     => swift_shared_secret,
               'swift_ringserver_ip'                     => '',
-              'swift_storage_ips'                       => '<%= @host.deployment.ips.controller_ips %>',
+              'swift_storage_ips'                       => { :array => '<%= @host.deployment.ips.controller_ips %>' },
               'cinder_nfs_shares'                       => [],
               'cinder_gluster_shares'                   => [],
               'controller_admin_host'                   => controller_host,
               'controller_priv_host'                    => controller_host,
               'controller_pub_host'                     => controller_host },
           'quickstack::pacemaker::params'          => {
+              'include_swift'                 => 'false',
               'include_neutron'               => neutron,
               'neutron'                       => neutron,
               'ceilometer_user_password'      => ceilometer_user_pw,
@@ -435,46 +434,47 @@ module Staypuft
               'neutron_user_password'         => neutron_user_pw,
               'nova_db_password'              => nova_db_pw,
               'nova_user_password'            => nova_user_pw,
+              'amqp_provider'                 => amqp_provider,
               'amqp_password'                 => amqp_pw,
               'heat_auth_encryption_key'      => heat_auth_encrypt_key,
               'neutron_metadata_proxy_secret' => neutron_metadata_proxy_secret,
-              'ceilometer_admin_vip'          => vip_format % :ceilometer,
-              'ceilometer_private_vip'        => vip_format % :ceilometer,
-              'ceilometer_public_vip'         => vip_format % :ceilometer,
-              'cinder_admin_vip'              => vip_format % :cinder,
-              'cinder_private_vip'            => vip_format % :cinder,
-              'cinder_public_vip'             => vip_format % :cinder,
-              'db_vip'                        => vip_format % :db,
-              'glance_admin_vip'              => vip_format % :glance,
-              'glance_private_vip'            => vip_format % :glance,
-              'glance_public_vip'             => vip_format % :glance,
-              'heat_admin_vip'                => vip_format % :heat,
-              'heat_private_vip'              => vip_format % :heat,
-              'heat_public_vip'               => vip_format % :heat,
-              'heat_cfn_admin_vip'            => vip_format % :heat_cfn,
-              'heat_cfn_private_vip'          => vip_format % :heat_cfn,
-              'heat_cfn_public_vip'           => vip_format % :heat_cfn,
-              'horizon_admin_vip'             => vip_format % :horizon,
-              'horizon_private_vip'           => vip_format % :horizon,
-              'horizon_public_vip'            => vip_format % :horizon,
-              'keystone_admin_vip'            => vip_format % :keystone,
-              'keystone_private_vip'          => vip_format % :keystone,
-              'keystone_public_vip'           => vip_format % :keystone,
-              'loadbalancer_vip'              => vip_format % :loadbalancer,
-              'neutron_admin_vip'             => vip_format % :neutron,
-              'neutron_private_vip'           => vip_format % :neutron,
-              'neutron_public_vip'            => vip_format % :neutron,
-              'nova_admin_vip'                => vip_format % :nova,
-              'nova_private_vip'              => vip_format % :nova,
-              'nova_public_vip'               => vip_format % :nova,
-              'amqp_vip'                      => vip_format % :amqp,
-              'swift_public_vip'              => vip_format % :swift,
-              'private_ip'                    => '<%= @host.ip %>',
-              'cluster_control_ip'            => '<%= @host.deployment.ips.controller_ips.first %>',
-              'lb_backend_server_addrs'       => '<%= @host.deployment.ips.controller_ips %>',
-              'lb_backend_server_names'       => '<%= @host.deployment.ips.controller_fqdns %>' },
+              'ceilometer_admin_vip'          => vip_format(:ceilometer),
+              'ceilometer_private_vip'        => vip_format(:ceilometer),
+              'ceilometer_public_vip'         => vip_format(:ceilometer),
+              'cinder_admin_vip'              => vip_format(:cinder),
+              'cinder_private_vip'            => vip_format(:cinder),
+              'cinder_public_vip'             => vip_format(:cinder),
+              'db_vip'                        => vip_format(:db),
+              'glance_admin_vip'              => vip_format(:glance),
+              'glance_private_vip'            => vip_format(:glance),
+              'glance_public_vip'             => vip_format(:glance),
+              'heat_admin_vip'                => vip_format(:heat),
+              'heat_private_vip'              => vip_format(:heat),
+              'heat_public_vip'               => vip_format(:heat),
+              'heat_cfn_admin_vip'            => vip_format(:heat_cfn),
+              'heat_cfn_private_vip'          => vip_format(:heat_cfn),
+              'heat_cfn_public_vip'           => vip_format(:heat_cfn),
+              'horizon_admin_vip'             => vip_format(:horizon),
+              'horizon_private_vip'           => vip_format(:horizon),
+              'horizon_public_vip'            => vip_format(:horizon),
+              'keystone_admin_vip'            => vip_format(:keystone),
+              'keystone_private_vip'          => vip_format(:keystone),
+              'keystone_public_vip'           => vip_format(:keystone),
+              'loadbalancer_vip'              => vip_format(:loadbalancer),
+              'neutron_admin_vip'             => vip_format(:neutron),
+              'neutron_private_vip'           => vip_format(:neutron),
+              'neutron_public_vip'            => vip_format(:neutron),
+              'nova_admin_vip'                => vip_format(:nova),
+              'nova_private_vip'              => vip_format(:nova),
+              'nova_public_vip'               => vip_format(:nova),
+              'amqp_vip'                      => vip_format(:amqp),
+              'swift_public_vip'              => vip_format(:swift),
+              'private_ip'                    => { :string => '<%= @host.ip %>' },
+              'cluster_control_ip'            => { :string => '<%= @host.deployment.ips.controller_ips.first %>' },
+              'lb_backend_server_addrs'       => { :array => '<%= @host.deployment.ips.controller_ips %>' },
+              'lb_backend_server_names'       => { :array => '<%= @host.deployment.ips.controller_fqdns %>' } },
           'quickstack::pacemaker::common'          => {
-              'pacemaker_cluster_members' => '<%= @host.deployment.ips.controller_ips.join(" ") %>' },
+              'pacemaker_cluster_members' => { :string => '<%= @host.deployment.ips.controller_ips.join(" ") %>' } },
           'quickstack::pacemaker::neutron'         => {
               'ml2_network_vlan_ranges'  => ml2_network_vlan_ranges,
               'ml2_tenant_network_types' => ml2_tenant_network_types,
@@ -523,10 +523,10 @@ module Staypuft
               'secret_key' => horizon_secret_key },
           'quickstack::pacemaker::galera'          => {
               'mysql_root_password'   => mysql_root_pw,
-              'wsrep_cluster_members' => '<%= @host.deployment.ips.controller_ips %>' },
+              'wsrep_cluster_members' => { :array => '<%= @host.deployment.ips.controller_ips %>' } },
           'quickstack::pacemaker::swift'           => {
               'swift_shared_secret' => swift_shared_secret,
-              'swift_internal_vip'  => vip_format % :swift,
+              'swift_internal_vip'  => vip_format(:swift),
               'swift_storage_ips'   => [] },
           'quickstack::pacemaker::nova'            => {
               'multi_host'                    => 'true',
@@ -555,6 +555,7 @@ module Staypuft
               'amqp_password'        => amqp_pw },
           'quickstack::nova_network::compute'      => {
               'amqp_provider'              => amqp_provider,
+              'ceilometer'                 => ceilometer,
               'cinder_backend_gluster'     => cinder_backend_gluster,
               'cinder_backend_nfs'         => cinder_backend_nfs,
               'network_manager'            => network_manager,
@@ -579,6 +580,7 @@ module Staypuft
               'nova_host'                  => nova_host },
           'quickstack::neutron::compute'           => {
               'amqp_provider'              => amqp_provider,
+              'ceilometer'                 => ceilometer,
               'cinder_backend_gluster'     => cinder_backend_gluster,
               'cinder_backend_nfs'         => cinder_backend_nfs,
               'enable_tunneling'           => enable_tunneling,
@@ -602,20 +604,27 @@ module Staypuft
               'neutron_host'               => neutron_host,
               'nova_host'                  => nova_host },
           'quickstack::pacemaker::rsync::keystone' => {
-              'keystone_private_vip' => vip_format % :keystone } }
+              'keystone_private_vip' => vip_format(:keystone) } }
     end
 
-    def get_key_type(value)
+    def get_key_type_and_value(value)
       key_list   = LookupKey::KEY_TYPES
-      value_type = value.class.to_s.downcase
-      if key_list.include?(value_type)
-        value_type
-      elsif [FalseClass, TrueClass].include? value.class
-        'boolean'
+      if value.class == Hash
+        key_type = value.keys.first.to_s
+        key_value = value.values.first
       else
-        raise
+        key_value = value
+        value_type = value.class.to_s.downcase
+        if key_list.include?(value_type)
+          key_type = value_type
+        elsif [FalseClass, TrueClass].include? value.class
+          key_type = 'boolean'
+        else
+          raise
+        end
       end
       # If we need to handle actual number classes like Fixnum, add those here
+      [key_type, key_value]
     end
 
     def seed_layouts
@@ -689,8 +698,9 @@ module Staypuft
                                        map { |lk| lk.param_class.name }.inspect
             next
           end
-          unless param.update_attributes default_value: default_value
-            Rails.logger.error "param #{param_key} in #{puppetclass_name} default_value: #{default_value.inspect} is invalid"
+          param_type, param_value = get_key_type_and_value(default_value)
+          unless param.update_attributes key_type: param_type, default_value: param_value
+            Rails.logger.error "param #{param_key} in #{puppetclass_name} default_value: #{param_value.inspect} is invalid"
           end
         end
       end
@@ -714,8 +724,7 @@ module Staypuft
     def apply_astapor_defaults(puppet_class)
       puppet_class.class_params.each do |param|
         if ASTAPOR_PARAMS.include?(param.key)
-          param.key_type      = get_key_type(ASTAPOR_PARAMS[param.key])
-          param.default_value = ASTAPOR_PARAMS[param.key]
+          param.key_type, param.default_value = get_key_type_and_value(ASTAPOR_PARAMS[param.key])
         end
         param.override = true
         param.save!

data/app/models/staypuft/deployment/cinder_service.rb

@@ -4,7 +4,8 @@ module Staypuft
       'cinder'
     end
 
-    param_attr :driver_backend, :nfs_uri, :nfs_mount_options
+    param_attr :driver_backend, :nfs_uri
+    after_save :set_lvm_ptable
 
     module DriverBackend
       LVM        = 'lvm'
@@ -87,5 +88,29 @@ module Staypuft
       ret_list
     end
 
+    def param_hash
+      { "driver_backend" => driver_backend, "nfs_uri" => nfs_uri}
+    end
+
+    def lvm_ptable
+      Ptable.find_by_name('LVM with cinder-volumes')
+    end
+
+    private
+
+    def set_lvm_ptable
+      if (hostgroup = deployment.controller_hostgroup)
+        ptable = lvm_ptable
+       if (lvm_backend? && ptable.nil?)
+          Rails.logger.error "Missing Partition Table 'LVM with cinder-volumes'"
+        end
+        if (lvm_backend? && ptable)
+          hostgroup.ptable = ptable
+        else
+          hostgroup.ptable = nil
+        end
+        hostgroup.save!
+      end
+    end
   end
 end

data/app/models/staypuft/deployment/glance_service.rb

@@ -6,8 +6,7 @@ module Staypuft
 
     NFS_HELP = N_('(<server>:<local path>)')
 
-    param_attr :driver_backend, :nfs_network_path, :gluster_network_path,
-               :gluster_backup_volfile_servers
+    param_attr :driver_backend, :nfs_network_path
 
     module DriverBackend
       LOCAL   = 'local'
@@ -31,7 +30,7 @@ module Staypuft
     # TODO: network_path validation
 
     class Jail < Safemode::Jail
-      allow :driver_backend, :pcmk_fs_device, :pcmk_fs_dir, :pcmk_fs_options
+      allow :driver_backend, :pcmk_fs_device, :pcmk_fs_options
     end
 
     def set_defaults
@@ -52,20 +51,12 @@ module Staypuft
       self.driver_backend == DriverBackend::NFS
     end
 
-    def network_path
+    def pcmk_fs_device
       if self.nfs_backend?
         self.nfs_network_path
       end
     end
 
-    def pcmk_fs_device
-      network_path.nil? ? '' : network_path.split(':')[0]
-    end
-
-    def pcmk_fs_dir
-      network_path.nil? ? '' : network_path.split(':')[1]
-    end
-
     def pcmk_fs_options
       if self.nfs_backend?
         "context=\"system_u:object_r:glance_var_lib_t:s0\")"
@@ -87,5 +78,9 @@ module Staypuft
       ret_list
     end
 
+    def param_hash
+      { "driver_backend" => driver_backend, "nfs_network_path" => nfs_network_path}
+    end
+
   end
 end

data/app/models/staypuft/deployment/ips.rb

@@ -6,12 +6,7 @@ module Staypuft
     end
 
     def controllers
-      @controllers ||= Hostgroup.
-          includes(:deployment_role_hostgroup).
-          where(DeploymentRoleHostgroup.table_name => { deployment_id: deployment,
-                                                        role_id:       Staypuft::Role.controller }).
-          first.
-          hosts
+      @controllers ||= deployment.controller_hostgroup.hosts.order(:id)
     end
 
     def controller_ips

data/app/models/staypuft/deployment/neutron_service.rb

@@ -145,5 +145,14 @@ module Staypuft
       [NetworkSegmentation::VXLAN, NetworkSegmentation::GRE].include?(network_segmentation)
     end
 
+    def param_hash
+      { 'network_segmentation'       => network_segmentation,
+        'tenant_vlan_ranges'         => tenant_vlan_ranges,
+        'networker_tenant_interface' => networker_tenant_interface,
+        'use_external_interface'     => use_external_interface,
+        'external_interface_name'    => external_interface_name,
+        'compute_tenant_interface'   => compute_tenant_interface }
+    end
+
   end
 end

data/app/models/staypuft/deployment/nova_service.rb

@@ -10,6 +10,44 @@ module Staypuft
     param_attr :network_manager, :vlan_range, :external_interface_name, :public_floating_range,
                :compute_tenant_interface, :private_fixed_range
 
+    class NetworkRangesValidator < ActiveModel::Validator
+      def validate(record)
+        valid_ranges = []
+        [:public_floating_range, :private_fixed_range].each do |range_param|
+          begin
+            unless (range_str = record.send(range_param)).empty?
+              ip_addr = IPAddr.new(range_str)
+              ip_range = ip_addr.to_range
+              if ip_range.begin == ip_range.end
+                record.errors[range_param] << "Specify address range, not single value"
+              else
+                valid_ranges << [range_param, ip_addr]
+              end
+            end
+          rescue
+            record.errors[range_param] << "Invalid Network Range Format"
+          end
+          # don't validate conflicts unless both ranges otherwise passed validation
+          if valid_ranges.size == 2
+            valid_ranges.each_with_index do |param_and_ip, index|
+              this_param_name = param_and_ip[0]
+              this_ip_range = param_and_ip[1].to_range
+
+              other_param_name = valid_ranges[(index+1)%2][0]
+              other_ip_addr = valid_ranges[(index+1)%2][1]
+              ["begin", "end"].each do |action|
+                if (other_ip_addr===this_ip_range.send(action))
+                  record.errors[this_param_name] << "Range #{action} #{this_ip_range.begin} overlaps with range for #{other_param_name.to_s.humanize}"
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    validates_with NetworkRangesValidator
+
     module NetworkManager
       FLAT_DHCP = 'FlatDHCPManager'
       VLAN      = 'VlanManager'
@@ -99,6 +137,15 @@ module Staypuft
       end
     end
 
+    def param_hash
+      { 'network_manager'          => network_manager,
+        'vlan_range'               => vlan_range,
+        'external_interface_name'  => external_interface_name,
+        'public_floating_range'    => public_floating_range,
+        'compute_tenant_interface' => compute_tenant_interface,
+        'private_fixed_range'      => private_fixed_range }
+    end
+
     class Jail < Safemode::Jail
       allow :network_manager, :network_overrides, :private_fixed_range, :public_floating_range,
         :compute_tenant_interface, :external_interface_name, :num_networks

data/app/models/staypuft/deployment/passwords.rb

@@ -87,5 +87,9 @@ module Staypuft
         h.update name => single_mode? ? single_password : self.send(name)
       end
     end
+
+    def param_hash
+      { "mode" => mode, "single_password" => single_password}
+    end
   end
 end

data/app/models/staypuft/deployment.rb

@@ -10,6 +10,10 @@ module Staypuft
 
     NEW_NAME_PREFIX = 'uninitialized_'
 
+    # supporting import/export
+    EXPORT_PARAMS   = [:amqp_provider, :networking, :layout_name, :platform]
+    EXPORT_SERVICES = [:nova, :neutron, :glance, :cinder, :passwords] 
+
     attr_accessible :description, :name, :layout_id, :layout,
                     :amqp_provider, :layout_name, :networking, :platform
     after_save :update_hostgroup_name
@@ -118,6 +122,17 @@ module Staypuft
       in_progress? ? {} : hostgroup.openstack_hosts(errors)
     end
 
+    # Helper method for getting the progress of this deployment
+    def progress
+      if self.in_progress?
+        (self.task.progress * 100).round(1)
+      elsif self.deployed?
+        100
+      else
+        0
+      end
+    end
+
     def self.param_scope
       'deployment'
     end
@@ -164,7 +179,7 @@ module Staypuft
 
     class Jail < Safemode::Jail
       allow :amqp_provider, :networking, :layout_name, :platform, :nova_networking?, :neutron_networking?,
-        :nova, :neutron, :glance, :cinder, :passwords, :vips, :ips, :ha?
+        :nova, :neutron, :glance, :cinder, :passwords, :vips, :ips, :ha?, :non_ha?
     end
 
     # TODO(mtaylor)
@@ -208,6 +223,10 @@ module Staypuft
       self.layout_name == LayoutName::HA
     end
 
+    def non_ha?
+      self.layout_name == LayoutName::NON_HA
+    end
+
     def nova_networking?
       networking == Networking::NOVA
     end
@@ -224,6 +243,13 @@ module Staypuft
       end
     end
 
+    def controller_hostgroup
+      Hostgroup.includes(:deployment_role_hostgroup).
+        where(DeploymentRoleHostgroup.table_name => { deployment_id: self,
+                                                      role_id:       Staypuft::Role.controller }).
+        first
+    end
+
     private
 
     def update_layout

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

@@ -0,0 +1,27 @@
+<% if deployment.in_progress? %>
+  <%= "#{deployment.progress}% #{_('Complete')}" %>
+  <div class="progress progress-striped <%= 'active' if deployment.task.state == 'running' %>">
+    <% classes = ['progress-bar',
+                  case deployment.task.result
+                  when 'success'
+                    'progress-bar-success'
+                  when 'error'
+                    'progress-bar-danger'
+                  else
+                    nil
+                  end]
+    %>
+    <div class="<%= classes.join ' ' %>"
+         role="progressbar"
+         aria-valuenow="<%= deployment.progress %>"
+         aria-valuemin="0"
+         aria-valuemax="100"
+         style="width: <%= deployment.progress %>%;">
+      <span class="sr-only"><%= deployment.progress %>% Complete</span>
+    </div>
+  </div>
+<% else %>
+  <script>
+    location.reload(true);
+  </script>
+<% end %>

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

@@ -43,33 +43,24 @@
       </div>
     </div>
   <% elsif @deployment.in_progress? %>
+    <script>
+      // Polling for progress bar updates
+      var pollingInterval = 10000;
+      setTimeout(updateProgress, pollingInterval);
+
+      function updateProgress() {
+        var url = $("#deployment_progress_bar").attr("data-poll-url");
+        $.getScript(url);
+        setTimeout(updateProgress, pollingInterval);
+      }
+    </script>
+
     <div class="row">
       <div class="col-sm-12 text-center"><h3 class="text-muted"><%= _("Deploying") %></h3></div>
     </div>
     <div class="row">
-      <div class="col-sm-6 col-sm-offset-3 text-center">
-        <% progress = 100 * @deployment.task.progress %>
-        <%= "#{progress.round(1)}% #{_('Complete')}" %>
-        <div class="progress progress-striped <%= 'active' if @deployment.task.state == 'running' %>">
-          <% classes = ['progress-bar',
-                        case @deployment.task.result
-                        when 'success'
-                          'progress-bar-success'
-                        when 'error'
-                          'progress-bar-danger'
-                        else
-                          nil
-                        end]
-          %>
-          <div class="<%= classes.join ' ' %>"
-               role="progressbar"
-               aria-valuenow="<%= progress %>"
-               aria-valuemin="0"
-               aria-valuemax="100"
-               style="width: <%= progress %>%;">
-            <span class="sr-only"><%= progress %>% Complete</span>
-          </div>
-        </div>
+      <div class="col-sm-6 col-sm-offset-3 text-center" id="deployment_progress_bar" data-poll-url="<%= deployment_path(@deployment) %>">
+        <%= render :partial => "deployment_progress_bar", :locals => { :deployment => @deployment } %>
       </div>
     </div>
     <div class="row">

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

@@ -1,4 +1,10 @@
-<% title(@deployment.name, edit_textfield(@deployment, :name, options={:update_url => deployment_path(@deployment)})) %>
+<% title(@deployment.name,
+         edit_textfield(@deployment,
+                        :name,
+                        options={:update_url => deployment_path(@deployment)}) +
+         content_tag(:small,
+                     @deployment.ha? ? _("with High Availability") : _("without High Availability"),
+                     :class => "text-muted")) %>
 <% subtitle edit_textfield(@deployment, :description, options={:update_url => deployment_path(@deployment)}) %>
 
 <% content_for(:top_actions) do %>

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

@@ -0,0 +1 @@
+$('#deployment_progress_bar').html("<%= escape_javascript(render :partial => 'deployment_progress_bar', :locals => { :deployment => @deployment }) %>");

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.1.11'
+  VERSION = '0.1.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.17
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -42,14 +42,14 @@ dependencies:
   name: wicked
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -73,113 +73,115 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- Rakefile
+- app/overrides/hide_subscription_manager_passwords.rb
+- app/overrides/customize_foreman_tasks_show_page.rb
+- app/helpers/staypuft/application_helper.rb
+- app/helpers/staypuft/deployments_helper.rb
 - app/assets/javascripts/staypuft/staypuft.js
-- app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss
 - app/assets/stylesheets/staypuft/foreman_helper.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/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/deployment_param_exporter.rb
-- app/lib/staypuft/deployment_param_importer.rb
-- app/lib/staypuft/exception.rb
-- app/lib/staypuft/seeder.rb
-- app/models/setting/staypuft_provisioning.rb
-- app/models/staypuft/concerns/environment_extensions.rb
-- app/models/staypuft/concerns/host_open_stack_affiliation.rb
+- 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/lookup_key_extensions.rb
 - app/models/staypuft/concerns/puppetclass_extensions.rb
-- app/models/staypuft/deployment.rb
-- app/models/staypuft/deployment/abstract_param_scope.rb
+- app/models/staypuft/concerns/environment_extensions.rb
+- app/models/staypuft/layout_role.rb
+- app/models/staypuft/service/ui_params.rb
+- app/models/staypuft/role.rb
+- app/models/staypuft/deployment/passwords.rb
+- app/models/staypuft/deployment/glance_service.rb
 - app/models/staypuft/deployment/attribute_param_storage.rb
+- app/models/staypuft/deployment/abstract_param_scope.rb
 - app/models/staypuft/deployment/cinder_service.rb
-- app/models/staypuft/deployment/glance_service.rb
+- app/models/staypuft/deployment/vips.rb
 - app/models/staypuft/deployment/ips.rb
 - app/models/staypuft/deployment/neutron_service.rb
 - app/models/staypuft/deployment/nova_service.rb
-- app/models/staypuft/deployment/passwords.rb
-- app/models/staypuft/deployment/vips.rb
-- app/models/staypuft/deployment_role_hostgroup.rb
-- app/models/staypuft/layout.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/ui_params.rb
-- app/models/staypuft/service_class.rb
-- app/overrides/customize_foreman_tasks_show_page.rb
-- app/overrides/hide_subscription_manager_passwords.rb
-- app/views/staypuft/deployments/_assigned_hosts_table.html.erb
-- app/views/staypuft/deployments/_deployed_hosts_table.html.erb
+- app/models/setting/staypuft_provisioning.rb
+- app/lib/staypuft/deployment_param_importer.rb
+- app/lib/staypuft/exception.rb
+- app/lib/staypuft/seeder.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/_deployment_access_all_details_dialogue.html.erb
 - app/views/staypuft/deployments/_deployment_progress_page_header.html.erb
-- app/views/staypuft/deployments/_deployment_summary.html.erb
-- app/views/staypuft/deployments/_free_hosts_table.html.erb
-- app/views/staypuft/deployments/_import_form.html.erb
-- app/views/staypuft/deployments/edit.html.erb
 - app/views/staypuft/deployments/index.html.erb
+- app/views/staypuft/deployments/_assigned_hosts_table.html.erb
+- app/views/staypuft/deployments/_deployment_summary.html.erb
+- app/views/staypuft/deployments/_deployment_progress_bar.html.erb
 - app/views/staypuft/deployments/show.html.erb
+- app/views/staypuft/deployments/edit.html.erb
+- app/views/staypuft/deployments/show.js.erb
+- app/views/staypuft/deployments/_deployed_hosts_table.html.erb
+- app/views/staypuft/deployments/_import_form.html.erb
+- app/views/staypuft/deployments/_free_hosts_table.html.erb
 - app/views/staypuft/deployments/summary.html.erb
-- app/views/staypuft/layouts/application.html.erb
 - app/views/staypuft/layouts/staypuft.html.erb
-- app/views/staypuft/steps/_cinder.html.erb
-- app/views/staypuft/steps/_glance.html.erb
+- app/views/staypuft/layouts/application.html.erb
+- app/views/staypuft/steps/services_overview.html.erb
 - app/views/staypuft/steps/_neutron.html.erb
+- app/views/staypuft/steps/deployment_settings.html.erb
 - app/views/staypuft/steps/_nova.html.erb
 - app/views/staypuft/steps/_title.html.erb
-- app/views/staypuft/steps/deployment_settings.html.erb
+- app/views/staypuft/steps/_glance.html.erb
 - app/views/staypuft/steps/services_configuration.html.erb
-- app/views/staypuft/steps/services_overview.html.erb
-- config/routes.rb
+- app/views/staypuft/steps/_cinder.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/20140623142500_remove_amqp_provider_from_staypuft_deployment.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/20140602121501_add_amqp_provider_to_staypuft_deployment.rb
-- db/migrate/20140623142500_remove_amqp_provider_from_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.rb
 - lib/staypuft/engine.rb
 - lib/staypuft/version.rb
+- lib/staypuft.rb
 - lib/tasks/staypuft_tasks.rake
-- test/factories/staypuft_factories.rb
-- test/integration/navigation_test.rb
-- test/staypuft_test.rb
+- LICENSE
+- Rakefile
+- README.md
 - 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: {}
@@ -189,25 +191,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 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
-has_rdoc: 
+- test/integration/navigation_test.rb
+- test/factories/staypuft_factories.rb
+- test/test_plugin_helper.rb