staypuft 0.1.7 → 0.1.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWFkYzZlNjIwZjcxOWRjNTM0NmU4ZDVmYzFiNGZiZTY5OGRmN2ZlYQ==
+    NTQzMDU0YjdiZTZhMzFmNWMyZWQ1OWMyZjBlZjcyNDliYTRjZThmNg==
   data.tar.gz: !binary |-
-    NjlkODZkMGY2OTNmZGJkMWQ3Y2E1MmIzODg2ZDc0ODczZTRiZGJkNA==
+    NTlhODNjYjdjYTY1ZDdhMDIyMGRlYWE3ZDc1NjQxMTY0YTJiZWNkMg==
 SHA512:
   metadata.gz: !binary |-
-    NDAyY2U4YjBlYTkyNDc3ZTNhN2JiNTk1ZGVmZDkxZmJlOTllODI2ODkxYzJk
-    MWY0ZTMyZGY1NTBkOGUyYjczYmI5M2I2M2FkNDEzNmZiNDY3NzYxOGU4MmRk
-    MGNiMTI5Y2U5MDM0MTliNTE3OTVmMzhkNDg5NWE0ZmE4ZWEwZjQ=
+    N2EzOWE0ZTE0MWI4MTk4MjI3MDM2NzA1MDlhZjdhMWVkNzZmMzQzZTQyNDA3
+    ZTMxODUzMGI4NGRlMmM3OTdjYTBiYTgxY2NhNTM1NWU4MzM5NTE2M2IyN2Uy
+    YmYwYTkxYWYzMTI3MDFlMzhjN2FiMDVlZDNmZjZiMTgxODM2MTQ=
   data.tar.gz: !binary |-
-    MjQ2YzU1MmYzYmRhMGRjZDQxNWFlYTk5MWYzOTU2ODUzNTlhMGQ2YzllMWIy
-    Y2JkYTc0ZGUzYjE3NzAzMGM2MjY1ODk3YzhhYTg5ZDY3ZWRjMGNmYmEzMjRj
-    MGE1M2NkOWI5YWQ2MTg2NzA5YTMyZGIzNzU3YmVmYjkzNDUwNmE=
+    MmFmY2FmODIwM2VlYjgwYTQxZmVkNzk5NzNmYTJlZTU4OTFjM2EwMjgzYmNh
+    YWVmODRkNWVmZWJiNzI2ZjBiMzMwNmFkNTdkYmE0Yjg4YzI4OWE3ZDliOTk4
+    ZTdmMmNkN2RkYjBmZTQ1MDE3MjU4ODRhYjViODhhODM3NThiZDI=

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

@@ -40,7 +40,7 @@ $(function () {
   $('.tabbed_side_nav_table').on('click', 'button.close', function() {
     $(this).closest('.tab-pane.active').removeClass('active');
     $(this).closest('.tabbed_side_nav_table').find('.activated').removeClass('activated');
-  })
+  });
 
   var duration = 150;
 
@@ -88,17 +88,6 @@ $(function () {
     }
   }
 
-  showNeutronExternalVlan();
-  $("input[name='staypuft_deployment[neutron][use_vlan_for_external_network]']").change(showNeutronExternalVlan);
-  function showNeutronExternalVlan() {
-    if ($('#staypuft_deployment_neutron_use_vlan_for_external_network').is(":checked")) {
-      $('.neutron_external_vlan').fadeIn(duration);
-    }
-    else {
-      $('.neutron_external_vlan').fadeOut(duration)
-    }
-  }
-
   showGlanceNfsNetworkPath();
   $("input[name='staypuft_deployment[glance][driver_backend]']").change(showGlanceNfsNetworkPath);
   function showGlanceNfsNetworkPath() {

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

@@ -87,8 +87,7 @@
 
 .tabbed_side_nav_table{
   .nav {
-    padding-top: 5px;
-    padding-right: 4px;
+    padding: 5px 4px 0px 15px;
     & > li.activated {
       z-index: 1;
       &:after, &:before {

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

@@ -9,10 +9,52 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require_tree .
  */
 
-//@import "bootstrap";
+@import "bootstrap_and_overrides";
+@import "bootstrap/buttons";
+@import "bootstrap/forms";
+
+.top_actions {
+  //same margin as h1 (title)
+  margin: 20px 0 10px;
+}
+
+.title h1 {
+  word-wrap: break-word;
+}
+
+span.editable, span.editable:hover {
+  background-color: transparent;
+  .spinner-placeholder{
+    margin:0;
+    background-repeat: no-repeat;
+    background-position: center center;
+    float: left;
+    padding: 0 150px;
+  }
+  form {
+    float: left;
+    @extend .form-inline;
+  }
+  input {
+    @extend .form-control;
+    width: auto !important;
+    margin-right: 10px;
+  }
+  button {
+    @extend .btn;
+    @extend .btn-default;
+    margin-right: 10px;
+    &:not(:last-child) {
+      @extend .btn-primary;
+    }
+  }
+}
+
+// span.edit_textfield button {
+//   margin-left: 5px;
+// }
 
 .service-box {
   width: 200px;

data/app/controllers/staypuft/deployments_controller.rb

@@ -25,20 +25,31 @@ module Staypuft
     end
 
     def update
-      if params[:staypuft_deployment]
-        param_data = params[:staypuft_deployment][:hostgroup_params]
-        param_data.each do |hostgroup_id, hostgroup_params|
-          hostgroup = Hostgroup.find(hostgroup_id)
-          hostgroup_params[:puppetclass_params].each do |puppetclass_id, puppetclass_params|
-            puppetclass = Puppetclass.find(puppetclass_id)
-            puppetclass_params.each do |param_name, param_value|
-              hostgroup.set_param_value_if_changed(puppetclass, param_name, param_value)
+      respond_to do | format |
+
+        format.html do
+          if params[:staypuft_deployment]
+            param_data = params[:staypuft_deployment][:hostgroup_params]
+            param_data.each do |hostgroup_id, hostgroup_params|
+              hostgroup = Hostgroup.find(hostgroup_id)
+              hostgroup_params[:puppetclass_params].each do |puppetclass_id, puppetclass_params|
+                puppetclass = Puppetclass.find(puppetclass_id)
+                puppetclass_params.each do |param_name, param_value|
+                  hostgroup.set_param_value_if_changed(puppetclass, param_name, param_value)
+                end
+              end
             end
           end
+          redirect_to summary_deployment_path(params[:id])
+        end
+
+        format.json do
+          @deployment = Deployment.find(params[:id])
+          @deployment.update_attributes(params[:deployment])
+          render :status => 200, :json => @deployment.to_json
         end
-      end
 
-      redirect_to summary_deployment_path(params[:id])
+      end
     end
 
     def edit

data/app/helpers/staypuft/application_helper.rb

@@ -1,5 +1,10 @@
 module Staypuft
   module ApplicationHelper
+
+    def subtitle(page_subtitle)
+      content_for(:subtitle, page_subtitle.to_s)
+    end
+
     def radio_button_f_non_inline(f, attr, options = {})
       text  = options.delete(:text)
       value = options.delete(:value)

data/app/lib/staypuft/seeder.rb

@@ -163,15 +163,16 @@ module Staypuft
 
     def functional_dependencies
       amqp_provider               = '<%= @host.deployment.amqp_provider %>'
-      neutron                     = '<%= @host.deployment.networking == Staypuft::Deployment::Networking::NEUTRON %>'
+      neutron                     = '<%= @host.deployment.neutron_networking? %>'
 
       # Nova
       network_manager             = '<%= @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.to_yaml %>'
-      # TODO: determine whether num_networks and network_size are static or calculated
-      network_num_networks        = 1
-      network_network_size        = 255
+      network_overrides           = '<%= @host.deployment.nova.network_overrides %>'
+      # TODO: num_networks should be calculated based on a specified VLAN range.
+      # Alternatively, it could be explicitly set by the user in combination
+      # with a starting VLAN ID.
+      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 %>'
@@ -201,15 +202,23 @@ module Staypuft
       pcmk_fs_dir                 = '<%= @host.deployment.glance.pcmk_fs_dir %>'
       pcmk_fs_manage              = 'true'
       pcmk_fs_options             = '<%= @host.deployment.glance.pcmk_fs_options %>'
+      glance_rbd_store_user       = 'glance'
+      glance_rbd_store_pool       = 'images' 
 
       # Cinder
       volume                      = true
+      cinder_backend_gluster      = false
+      cinder_backend_gluster_name = 'gluster_backend'
       cinder_backend_iscsi        = '<%= @host.deployment.cinder.lvm_backend? %>'
+      cinder_backend_iscsi_name   = 'iscsi_backend'
       cinder_backend_nfs          = '<%= @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_name                 = 'rbd_backend'
       # TODO: confirm these params and add them to model where user input is needed
       cinder_rbd_pool                         = 'volumes'
       cinder_rbd_ceph_conf                    = '/etc/ceph/ceph.conf/'
@@ -219,6 +228,7 @@ module Staypuft
       cinder_rbd_secret_uuid                  = ''
 
       cinder_backend_eqlx           = '<%= @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
       cinder_san_ip                 = [''] # ['<%= #@host.deployment.cinder.san_ip %>']
@@ -279,18 +289,25 @@ module Staypuft
       {
           'quickstack::nova_network::controller'   => {
               'amqp_provider'                           => amqp_provider,
+              'cinder_backend_gluster'                  => cinder_backend_gluster,
+              'cinder_backend_gluster_name'             => cinder_backend_gluster_name,
               'cinder_backend_iscsi'                    => cinder_backend_iscsi,
+              'cinder_backend_iscsi_name'               => cinder_backend_iscsi_name,
               'cinder_backend_nfs'                      => cinder_backend_nfs,
+              'cinder_backend_nfs_name'                 => cinder_backend_nfs_name,
+              'cinder_backend_rbd'                      => cinder_backend_rbd,
+              'cinder_backend_rbd_name'                 => cinder_backend_rbd_name,
+              'cinder_backend_eqlx'                     => cinder_backend_eqlx,
+              'cinder_backend_eqlx_name'                => cinder_backend_eqlx_name,
+              'cinder_multiple_backends'                => cinder_multiple_backends,
               'cinder_nfs_shares'                       => cinder_nfs_shares,
               'cinder_nfs_mount_options'                => cinder_nfs_mount_options,
-              'cinder_backend_rbd'                      => cinder_backend_rbd,
               'cinder_rbd_pool'                         => cinder_rbd_pool,
               'cinder_rbd_ceph_conf'                    => cinder_rbd_ceph_conf,
               'cinder_rbd_flatten_volume_from_snapshot' => cinder_rbd_flatten_volume_from_snapshot,
               'cinder_rbd_max_clone_depth'              => cinder_rbd_max_clone_depth,
               'cinder_rbd_user'                         => cinder_rbd_user,
               'cinder_rbd_secret_uuid'                  => cinder_rbd_secret_uuid,
-              'cinder_backend_eqlx'                     => cinder_backend_eqlx,
               'cinder_san_ip'                           => cinder_san_ip,
               'cinder_san_login'                        => cinder_san_login,
               'cinder_san_password'                     => cinder_san_password,
@@ -301,6 +318,8 @@ module Staypuft
               'cinder_eqlx_chap_login'                  => cinder_eqlx_chap_login,
               'cinder_eqlx_chap_password'               => cinder_eqlx_chap_password,
               'glance_backend'                          => backend,
+              'glance_rbd_store_user'                   => glance_rbd_store_user,
+              'glance_rbd_store_pool'                   => glance_rbd_store_pool,
               'admin_password'                          => admin_pw,
               'ceilometer_user_password'                => ceilometer_user_pw,
               'cinder_db_password'                      => cinder_db_pw,
@@ -338,18 +357,25 @@ module Staypuft
               'ml2_vni_ranges'                          => ml2_vni_ranges,
               'ovs_vlan_ranges'                         => ovs_vlan_ranges,
               'enable_tunneling'                        => enable_tunneling,
+              'cinder_backend_gluster'                  => cinder_backend_gluster,
+              'cinder_backend_gluster_name'             => cinder_backend_gluster_name,
               'cinder_backend_iscsi'                    => cinder_backend_iscsi,
+              'cinder_backend_iscsi_name'               => cinder_backend_iscsi_name,
               'cinder_backend_nfs'                      => cinder_backend_nfs,
+              'cinder_backend_nfs_name'                 => cinder_backend_nfs_name,
+              'cinder_backend_rbd'                      => cinder_backend_rbd,
+              'cinder_backend_rbd_name'                 => cinder_backend_rbd_name,
+              'cinder_backend_eqlx'                     => cinder_backend_eqlx,
+              'cinder_backend_eqlx_name'                => cinder_backend_eqlx_name,
+              'cinder_multiple_backends'                => cinder_multiple_backends,
               'cinder_nfs_shares'                       => cinder_nfs_shares,
               'cinder_nfs_mount_options'                => cinder_nfs_mount_options,
-              'cinder_backend_rbd'                      => cinder_backend_rbd,
               'cinder_rbd_pool'                         => cinder_rbd_pool,
               'cinder_rbd_ceph_conf'                    => cinder_rbd_ceph_conf,
               'cinder_rbd_flatten_volume_from_snapshot' => cinder_rbd_flatten_volume_from_snapshot,
               'cinder_rbd_max_clone_depth'              => cinder_rbd_max_clone_depth,
               'cinder_rbd_user'                         => cinder_rbd_user,
               'cinder_rbd_secret_uuid'                  => cinder_rbd_secret_uuid,
-              'cinder_backend_eqlx'                     => cinder_backend_eqlx,
               'cinder_san_ip'                           => cinder_san_ip,
               'cinder_san_login'                        => cinder_san_login,
               'cinder_san_password'                     => cinder_san_password,
@@ -360,6 +386,8 @@ module Staypuft
               'cinder_eqlx_chap_login'                  => cinder_eqlx_chap_login,
               'cinder_eqlx_chap_password'               => cinder_eqlx_chap_password,
               'glance_backend'                          => backend,
+              'glance_rbd_store_user'                   => glance_rbd_store_user,
+              'glance_rbd_store_pool'                   => glance_rbd_store_pool,
               'admin_password'                          => admin_pw,
               'ceilometer_user_password'                => ceilometer_user_pw,
               'cinder_db_password'                      => cinder_db_pw,
@@ -444,6 +472,7 @@ module Staypuft
               'nova_public_vip'               => vip_format % :nova,
               'amqp_vip'                      => vip_format % :amqp,
               'swift_public_vip'              => vip_format % :swift,
+              '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 %>' },
           'quickstack::pacemaker::common'          => {
@@ -469,6 +498,7 @@ module Staypuft
               'volume'                           => volume,
               'backend_iscsi'                    => cinder_backend_iscsi,
               'backend_nfs'                      => cinder_backend_nfs,
+              'backend_gluster'                  => cinder_backend_gluster,
               'nfs_shares'                       => cinder_nfs_shares,
               'nfs_mount_options'                => cinder_nfs_mount_options,
               'backend_rbd'                      => cinder_backend_rbd,
@@ -527,10 +557,11 @@ module Staypuft
               'amqp_password'        => amqp_pw },
           'quickstack::nova_network::compute'      => {
               'amqp_provider'              => amqp_provider,
+              'cinder_backend_gluster'     => cinder_backend_gluster,
+              'cinder_backend_nfs'         => cinder_backend_nfs,
               'network_manager'            => network_manager,
               'network_overrides'          => network_overrides,
               'network_num_networks'       => network_num_networks,
-              'network_network_size'       => network_network_size,
               'network_fixed_range'        => network_fixed_range,
               'network_floating_range'     => network_floating_range,
               'network_private_iface'      => network_private_iface,
@@ -550,6 +581,8 @@ module Staypuft
               'nova_host'                  => nova_host },
           'quickstack::neutron::compute'           => {
               'amqp_provider'              => amqp_provider,
+              'cinder_backend_gluster'     => cinder_backend_gluster,
+              'cinder_backend_nfs'         => cinder_backend_nfs,
               'enable_tunneling'           => enable_tunneling,
               'ovs_bridge_mappings'        => compute_ovs_bridge_mappings,
               'ovs_bridge_uplinks'         => compute_ovs_bridge_uplinks,
@@ -652,7 +685,10 @@ module Staypuft
           param = puppetclass.class_params.find_by_key(param_key)
           unless param
             Rails.logger.error "missing param #{param_key} in #{puppetclass_name} trying to set default_value: #{default_value.inspect} found in puppetclasses: " +
-                                   LookupKey.search_for(param_key).map { |lk| (c = (lk.param_class || lk.puppetclass)).nil? ? "class not found" : c.name }.inspect
+                                   LookupKey.
+                                       smart_class_parameters.
+                                       search_for("key = #{param_key}").
+                                       map { |lk| lk.param_class.name }.inspect
             next
           end
           unless param.update_attributes default_value: default_value

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

@@ -43,3 +43,7 @@ module Staypuft
     end
   end
 end
+
+class ::Host::Managed::Jail < Safemode::Jail
+  allow :deployment
+end

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

@@ -30,13 +30,26 @@ module Staypuft::Concerns::LookupKeyExtensions
     self.send(method, value) rescue raise TypeError
   end
 
-  def has_erb? value
+  def self.has_erb?(value)
     value =~ /<%.*%>/
   end
 
+  def has_erb?(value)
+    Staypuft::Concerns::LookupKeyExtensions.has_erb? value
+  end
+
+  def self.evaluate_value(hostgroup, value)
+    host = Host::Managed.new(hostgroup: hostgroup, name: 'renderer')
+    SafeRender.new(:variables => { :host => host }).parse(value)
+  rescue => e
+    "ERROR: #{e.message} (#{e.class})"
+  end
+
   def value_before_type_cast_with_limpet(value)
-    value_before_type_cast_without_limpet(value).tap do |v|
-      v.gsub!(LIMPET_FORMAT_REGEXP, '<%=') if has_erb? v
+    if has_erb? value
+      value.gsub(LIMPET_FORMAT_REGEXP, '<%=')
+    else
+      value_before_type_cast_without_limpet(value)
     end
   end
 
@@ -64,6 +77,10 @@ module Staypuft::Concerns::LookupKeyExtensions
         else
           value
         end
+      rescue => exc
+        # TODO fix in foreman
+        Rails.logger.error "There was error rendering string: #{string.inspect}\n#{exc} (#{exc.class})\n#{exc.backtrace.join("\n")}"
+        raise exc
       end
     end
   end

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

@@ -18,11 +18,11 @@ module Staypuft
       TYPES      = LABELS.keys
       HUMAN      = N_('Choose Driver Backend')
     end
-    validates :driver_backend, presence: true, inclusion: { in: lambda {|c| c.backend_types_for_layout } }
+    validates :driver_backend, presence: true, inclusion: { in: lambda { |c| c.backend_types_for_layout } }
 
     module NfsUri
-      HUMAN = N_('NFS URI:')
-      HUMAN_AFTER = N_('("example.com/path/to/mount")')
+      HUMAN       = N_('NFS URI:')
+      HUMAN_AFTER = Deployment::GlanceService::NFS_HELP
     end
     validates :nfs_uri,
               :presence => true,
@@ -34,6 +34,10 @@ module Staypuft
     # TODO: add EqualLogic UI parameters
 
 
+    class Jail < Safemode::Jail
+      allow :lvm_backend?, :nfs_backend?, :nfs_uri, :ceph_backend?, :equallogic_backend?
+    end
+
     def set_defaults
       self.driver_backend = DriverBackend::LVM
     end

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

@@ -4,6 +4,8 @@ module Staypuft
       'glance'
     end
 
+    NFS_HELP = N_('(<server>:<local path>)')
+
     param_attr :driver_backend, :nfs_network_path, :gluster_network_path,
                :gluster_backup_volfile_servers
 
@@ -20,7 +22,7 @@ module Staypuft
 
     module NfsNetworkPath
       HUMAN       = N_('network path')
-      HUMAN_AFTER = '(server:localpath)'
+      HUMAN_AFTER = NFS_HELP
     end
 
     validates :nfs_network_path,
@@ -28,6 +30,10 @@ module Staypuft
               :if       => :nfs_backend?
     # TODO: network_path validation
 
+    class Jail < Safemode::Jail
+      allow :driver_backend, :pcmk_fs_device, :pcmk_fs_dir, :pcmk_fs_options
+    end
+
     def set_defaults
       self.driver_backend = DriverBackend::LOCAL
     end

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

@@ -1,6 +1,10 @@
 module Staypuft
   class Deployment::IPS < Deployment::AbstractParamScope
 
+    class Jail < Safemode::Jail
+      allow :controller_ip, :controller_ips, :controller_fqdns
+    end
+
     def controllers
       @controllers ||= Hostgroup.
           includes(:deployment_role_hostgroup).

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

@@ -10,8 +10,7 @@ module Staypuft
 
 
     param_attr :network_segmentation, :tenant_vlan_ranges, :networker_tenant_interface,
-               :use_external_interface, :external_interface_name, :compute_tenant_interface,
-               :use_vlan_for_external_network, :vlan_ranges_for_external_network
+               :use_external_interface, :external_interface_name, :compute_tenant_interface
 
     module NetworkSegmentation
       VXLAN  = 'vxlan'
@@ -63,22 +62,6 @@ module Staypuft
               :if       => :use_external_interface?
     # TODO: interface name format validation
 
-    module UseVlanForExternalNetwork
-      HUMAN = N_('Configure VLAN for external network')
-    end
-
-    validates :use_vlan_for_external_network, inclusion: { in: [true, false, 'true', 'false'] }
-
-    module VlanRangesForExternalNetwork
-      HUMAN       = N_('VLAN Range for external network')
-      HUMAN_AFTER = N_('i.e. 1000:2999')
-    end
-
-    validates :vlan_ranges_for_external_network,
-              :presence => true,
-              :if       => :external_network_vlan?
-    # TODO: vlan rangesformat validation
-
     module ComputeTenantInterface
       HUMAN       = N_('Which interface to use for tenant networks:')
       HUMAN_AFTER = INTERFACE_HELP
@@ -88,6 +71,12 @@ module Staypuft
               :presence => true
     # TODO: interface name format validation
 
+    class Jail < Safemode::Jail
+      allow :networker_vlan_ranges, :compute_vlan_ranges, :network_segmentation, :enable_tunneling?,
+        :networker_tenant_interface, :networker_ovs_bridge_mappings, :networker_ovs_bridge_uplinks,
+        :compute_tenant_interface, :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks
+    end
+
     def set_defaults
       self.network_segmentation   = NetworkSegmentation::VXLAN
       self.use_external_interface = 'false'
@@ -102,11 +91,6 @@ module Staypuft
       (self.use_external_interface == true) || (self.use_external_interface == 'true')
     end
 
-    # TODO: make this less clumsy w/ consistent handling of true/false values
-    def use_vlan_for_external_network?
-      (self.use_vlan_for_external_network == true) || (self.use_vlan_for_external_network == 'true')
-    end
-
     # return list of supported segmentation options with selected option at the
     # beginning of the list
     def network_segmentation_list
@@ -150,17 +134,13 @@ module Staypuft
 
     def networker_vlan_ranges
       [("physnet-tenants:#{self.tenant_vlan_ranges}" if self.vlan_segmentation?),
-       ("physnet-external:#{self.vlan_ranges_for_external_network}" if self.external_network_vlan?)].compact
+       "physnet-external"].compact
     end
 
     def vlan_segmentation?
       self.network_segmentation == NetworkSegmentation::VLAN
     end
 
-    def external_network_vlan?
-      self.use_external_interface? && self.use_vlan_for_external_network?
-    end
-
     def enable_tunneling?
       [NetworkSegmentation::VXLAN, NetworkSegmentation::GRE].include?(network_segmentation)
     end

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

@@ -80,7 +80,17 @@ module Staypuft
     def network_overrides
       { 'force_dhcp_release' => false }.tap do |h|
         h.update 'vlan_start' => self.vlan_range.split(':')[0] if self.vlan_manager?
-      end
+      end.to_yaml
+    end
+
+    # TODO: make this dynamic
+    def num_networks
+      1
+    end
+
+    class Jail < Safemode::Jail
+      allow :network_manager, :network_overrides, :private_fixed_range, :public_floating_range,
+        :compute_tenant_interface, :external_interface_name, :num_networks
     end
 
   end

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

@@ -40,6 +40,11 @@ module Staypuft
               :if           => :single_mode?,
               :length       => { minimum: 6 }
 
+    class Jail < Safemode::Jail
+      allow :effective_value, :ceilometer_metering_secret, :heat_auth_encrypt_key,
+        :horizon_secret_key, :swift_shared_secret, :neutron_metadata_proxy_secret
+    end
+
     def set_defaults
       self.mode = Mode::RANDOM
       PASSWORD_LIST.each do |password_field|

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

@@ -13,6 +13,10 @@ module Staypuft
 
     HUMAN = N_('Virtual IP addresses range')
 
+    class Jail < Safemode::Jail
+      allow :get
+    end
+
     def range
       (user_range || default_range)
       # TODO reserve the IP addresses

data/app/models/staypuft/deployment.rb

@@ -71,7 +71,7 @@ module Staypuft
     def initialize(attributes = {}, options = {})
       super({ amqp_provider: AmqpProvider::RABBITMQ,
               layout_name:   LayoutName::NON_HA,
-              networking:    Networking::NOVA,
+              networking:    Networking::NEUTRON,
               platform:      Platform::RHEL7 }.merge(attributes),
             options)
 
@@ -119,7 +119,7 @@ module Staypuft
     module Networking
       NOVA    = 'nova'
       NEUTRON = 'neutron'
-      LABELS  = { NOVA => N_('Nova Network'), NEUTRON => N_('Neutron Networking') }
+      LABELS  = { NEUTRON => N_('Neutron Networking'), NOVA => N_('Nova Network') }
       TYPES   = LABELS.keys
       HUMAN   = N_('Networking')
     end
@@ -148,6 +148,11 @@ module Staypuft
     validates :layout_name, presence: true, inclusion: { in: LayoutName::TYPES }
     validates :platform, presence: true, inclusion: { in: Platform::TYPES }
 
+    class Jail < Safemode::Jail
+      allow :amqp_provider, :networking, :layout_name, :platform, :nova_networking?, :neutron_networking?,
+        :nova, :neutron, :glance, :cinder, :passwords, :vips, :ips, :ha?
+    end
+
     # 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
@@ -189,6 +194,14 @@ module Staypuft
       self.layout_name == LayoutName::HA
     end
 
+    def nova_networking?
+      networking == Networking::NOVA
+    end
+
+    def neutron_networking?
+      networking == Networking::NEUTRON
+    end
+
     private
 
     def update_layout

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

@@ -1,6 +1,6 @@
 <% title _("Edit - %s Configuration Parameters") % @deployment.name %>
-<% content_for(:title_actions) do %>
-  <%= link_to _("Back to Deployment"), deployment_path(@deployment.id) %>
+<% content_for(:top_actions) do %>
+  <%= link_to _("Back to Deployment"), deployment_path(@deployment.id), :class => "btn btn-link" %>
   <%= link_to _("Apply"), '',
               class: "btn btn-primary",
               id:    'edit_staypuft_deployment_submit' %>

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

@@ -1,25 +1,19 @@
-<% title @deployment.name %>
+<% title(@deployment.name, edit_textfield(@deployment, :name, options={:update_url => deployment_path(@deployment)})) %>
+<% subtitle edit_textfield(@deployment, :description, options={:update_url => deployment_path(@deployment)}) %>
 
-<% content_for(:title_actions) do %>
-  <%= link_to(_("Advanced Configuration"), summary_deployment_path(@deployment.id), :class => '') %>
+<% content_for(:top_actions) do %>
+  <%= link_to(_("Advanced Configuration"), summary_deployment_path(@deployment.id), :class => 'btn btn-link') %>
   <%= link_to(_("Revisit Setup Wizard"), if @deployment.deployed?
                                            deployment_step_path(deployment_id: @deployment, id: 'services_configuration')
                                          else
                                            deployment_steps_path(deployment_id: @deployment)
-                                         end) %>
+                                         end, :class => "btn btn-default") %>
 
-  <% if @deployment.in_progress? %>
-    <%= display_link_if_authorized(
-            _('Deploy in progress'),
-            hash_for_foreman_tasks_task_path(id: ForemanTasks::Lock.colliding_locks(@deployment, nil).first.task.id),
-            :class => 'btn-info') %>
-  <% else %>
-    <%= link_to(_("Deploy"),
-                "",
-                :class         => %w(btn btn-primary),
-                :'data-toggle' => "modal",
-                :'data-target' => "#deploy_modal") %>
-  <% end %>
+  <%= link_to(_("Deploy"),
+              "",
+              :class         => @deployment.in_progress? ? %w(btn btn-primary disabled) : %w(btn btn-primary),
+              :'data-toggle' => "modal",
+              :'data-target' => "#deploy_modal") %>
 
   <% if Rails.env.development? %>
     <div class="btn-group">

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

@@ -1,16 +1,17 @@
 <% title _("%s Configuration Parameters") % @deployment.name %>
-<% content_for(:title_actions) do %>
-  <%= link_to _("Back to Deployment"), deployment_path(@deployment.id) %>
+<% content_for(:top_actions) do %>
+  <%= link_to _("Back to Deployment"), deployment_path(@deployment.id), :class => "btn btn-link" %>
   <%= link_to(icon_text("cloud-upload", _("Import")),
               {},
-              { :remote => true,
+              { :class => "btn btn-default",
+                :remote => true,
                 :rel    => 'popover',
                 :data   => { 'content'        => "#{render partial: 'import_form'}",
                              'original-title' => _('Import Config'),
                              'placement'      => 'left' } }) %>
   <%= link_to(icon_text("cloud-download", _("Export")),
-              export_config_deployment_path(@deployment.id)) %>
-  <%= link_to _("Edit"), edit_deployment_path(@deployment.id) %>
+              export_config_deployment_path(@deployment.id), :class => "btn btn-default") %>
+  <%= link_to _("Edit"), edit_deployment_path(@deployment.id), :class => "btn btn-default" %>
 <% end %>
 
 <div class="col-md-12">
@@ -41,10 +42,16 @@
                                             param_hash[:hostgroup].id,
                                             param_hash[:puppetclass].id,
                                             param_hash[:param_key].key),
-                                     param_hash[:hostgroup].current_param_value_str(param_hash[:param_key]),
+                                     value     = param_hash[:hostgroup].current_param_value_str(param_hash[:param_key]),
                                      :class    => "form-control",
                                      :size     => "45",
                                      disabled: true %>
+                  <% if Staypuft::Concerns::LookupKeyExtensions.has_erb? value %>
+                    <span class="help-block">
+                      <%= _('evaluates to: ') %>
+                      <%= Staypuft::Concerns::LookupKeyExtensions.evaluate_value param_hash[:hostgroup], value %>
+                    </span>
+                  <% end %>
                 </div>
               </div>
               <br/>
@@ -52,7 +59,7 @@
           <% else %>
             <p><%= _("No configuration needed for this service.") %></p>
           <% end %>
-          <% # render "puppetclasses/classes_parameters", { :obj => service.hostgroups.first } %>
+          <% # render "puppetclasses/classes_parameters", { :obj => service.hostgroups.first }  %>
         </div>
       <% end %>
     </div>

data/app/views/staypuft/layouts/application.html.erb

@@ -0,0 +1,44 @@
+<%= content_for(:content) do %>
+  <div id="main">
+    <%= content_tag('div', flash[:error],   :class => 'flash hide error')   if flash[:error] %>
+    <%= content_tag('div', flash[:warning], :class => 'flash hide warning') if flash[:warning] %>
+    <%= content_tag('div', flash[:notice],  :class => 'flash hide notice')  if flash[:notice] %>
+    <%= render 'common/notice' unless @notices.empty? %>
+    <div id="content" class="container">
+      <div class="title row form-group">
+        <div class="col-sm-12">
+          <div class="pull-left">
+            <h1 class=""><%=h @page_header if @page_header.present? %></h1>
+            <% if content_for? :subtitle %>
+              <div class="subtitle">
+                <%= yield(:subtitle) %>
+              </div>
+            <% end %>
+          </div>
+          <% if content_for? :top_actions %>
+            <div class="top_actions pull-right">
+              <div class="btn-toolbar pull-right">
+                <%= yield(:top_actions) %>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
+      <% if content_for?(:search_bar) || content_for?(:title_actions) %>
+        <div class="row">
+          <div class="title_filter <%= searchable? ? "col-md-6" : "col-md-4" %>">
+            <%= render "common/searchbar" if searchable? %>
+            <%= yield(:search_bar) %>&nbsp;
+          </div>
+          <div id="title_action" class="<%= searchable? ? "col-md-6" : "col-md-8" %>">
+            <div class="btn-toolbar pull-right"><%=h yield(:title_actions) %></div>
+          </div>
+        </div>
+      <% end %>
+
+      <%= yield %>
+    </div>
+  </div>
+<% end %>
+
+<%= render :template => 'layouts/base' %>

data/app/views/staypuft/layouts/staypuft.html.erb

@@ -7,4 +7,4 @@
 <% end %>
 
 
-<%= render :template => 'layouts/application' %>
+<%= render :template => 'staypuft/layouts/application' %>

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

@@ -31,18 +31,6 @@
                                      label:       _(Staypuft::Deployment::NeutronService::ExternalInterfaceName::HUMAN),
                                      help_inline: _(Staypuft::Deployment::NeutronService::ExternalInterfaceName::HUMAN_AFTER)) %>
 
-    <%= check_box_f_non_inline(p, :use_vlan_for_external_network,
-                               :checked_value   => 'true',
-                               :unchecked_value => 'false',
-                               :text            => Staypuft::Deployment::NeutronService::UseVlanForExternalNetwork::HUMAN)
-    %>
-
-    <div class="neutron_external_vlan col-md-offset-0 hide">
-      <%= change_label_width 4, text_f(p, :vlan_ranges_for_external_network,
-                                       label:       _(Staypuft::Deployment::NeutronService::VlanRangesForExternalNetwork::HUMAN),
-                                       help_inline: _(Staypuft::Deployment::NeutronService::VlanRangesForExternalNetwork::HUMAN_AFTER)) %>
-    </div>
-
   </div>
 
 

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.1.7'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -134,6 +134,7 @@ files:
 - app/views/staypuft/deployments/index.html.erb
 - app/views/staypuft/deployments/show.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