staypuft 0.1.5 → 0.1.6

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

@@ -0,0 +1,50 @@
+<% title _("%s Deployment - Advanced Configuration") % @deployment.name %>
+<% content_for(:title_actions) do %>
+  <%= link_to _("Back to Summary"), summary_deployment_path(@deployment.id)%>
+<% end %>
+
+
+<div class="col-md-12">
+  <div class="form-group tabbed_side_nav_form row">
+    <ul class="nav nav-pills nav-stacked col-md-3" data-tabs="pills">
+      <h3><%= _("Services") %></h3>
+      <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
+        <li class="<%= 'active' if i == 0 %>">
+          <a href="#<%= service.name.parameterize.underscore %>" data-toggle="tab">
+            <%= service.name %>
+          </a>
+        </li>
+      <% end %>
+    </ul>
+
+    <div class="tab-content col-md-9">
+      <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
+        <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= service.name.parameterize.underscore %>">
+          <h3><%= "#{service.name} " + _("Service Configuration") %></h3>
+          <% if (params_hash = service.ui_params_for_form(hostgroup)).size > 0 %>
+            <% params_hash.each do |param_hash| %>
+              <div class="row">
+                <div class="col-md-4 control-label">
+                  <%= label_tag param_hash[:param_key].key %>
+                </div>
+                <div class="col-md-5">
+                  <%= text_field_tag format("staypuft_deployment[hostgroup_params][%s][puppetclass_params][%s][%s]",
+                                            param_hash[:hostgroup].id,
+                                            param_hash[:puppetclass].id,
+                                            param_hash[:param_key].key),
+                                     param_hash[:hostgroup].current_param_value_str(param_hash[:param_key]),
+                                     :class => "form-control",
+                                     :size  => "45" %>
+                </div>
+              </div>
+              <br/>
+            <% end %>
+          <% else %>
+            <p><%= _("No configuration needed for this service.") %></p>
+          <% end %>
+          <% # render "puppetclasses/classes_parameters", { :obj => service.hostgroups.first } %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -2,7 +2,7 @@
 
 <% content_for(:title_actions) do %>
 
-  <%= link_to(_("Edit"), if @deployment.deployed?
+  <%= link_to(_("Revisit Setup Wizard"), if @deployment.deployed?
                            deployment_step_path(deployment_id: @deployment, id: 'services_configuration')
                          else
                            deployment_steps_path(deployment_id: @deployment)
@@ -15,6 +15,7 @@
     </button>
     <ul class="dropdown-menu dropdown keep-open" role="menu">
       <li><%= link_to(_("Summary"), summary_deployment_path(@deployment.id), :class => '') %></li>
+      <li><%= link_to _("Advanced Configuration"), edit_deployment_path(@deployment.id)%></li>
       <li>
         <%= link_to(icon_text("cloud-upload", _("Import")),
                     {},
@@ -51,7 +52,7 @@
     </div>
   <% end %>
 
-  <% if ForemanTasks::Lock.locked? @deployment, nil %>
+  <% 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),
@@ -59,7 +60,7 @@
   <% else %>
     <%= link_to(_("Deploy"),
                 "",
-                :class         => %w(btn btn-success),
+                :class         => %w(btn btn-primary),
                 :'data-toggle' => "modal",
                 :'data-target' => "#deploy_modal") %>
   <% end %>
@@ -70,90 +71,51 @@
 
 <div class="row tabbed_side_nav_table">
   <ul class="nav nav-pills nav-stacked col-md-4" data-tabs="pills">
-    <h3><%= _("Host Groups") %></h3>
+    <h3><%= _("Deployment Roles") %></h3>
     <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
-      <li class="<%= 'active' if @hostgroup == child_hostgroup %>">
-        <a href="#<%= child_hostgroup.name.parameterize.underscore %>" data-toggle="tab" class="roles_list">
-          <div class="col-xs-2 text-center">
-            <i class="glyphicon glyphicon-ok"></i>
-            <span><%= child_hostgroup.hosts.select { |h| h.open_stack_deployed? && !h.error? }.count %></span>
-          </div>
-          <div class="col-xs-2 text-center">
-            <i class="glyphicon glyphicon-warning-sign"></i>
-            <span><%= child_hostgroup.hosts.select { |h| h.open_stack_deployed? && h.error? }.count %></span>
-          </div>
-          <div class="col-xs-2 text-center">
-            <i class="glyphicon glyphicon-time"></i>
-            <span><%= child_hostgroup.hosts.select { |h| !h.open_stack_deployed? }.count %></span>
+      <li>
+        <div class="col-xs-2">
+          <% if child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? }.count > 0 %>
+            <a href="#<%= child_hostgroup.name.parameterize.underscore %>_deployed_hosts" data-toggle="tab" class="roles_list">
+              <span><%= child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? }.count %></span>
+            </a>
+          <% else %>
+            <span><%= child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? }.count %></span>
+          <% end %>
+        </div>
+        <div class="col-xs-6">
+          <div class="group_name">
+            <%= child_hostgroup.name %>
           </div>
-          <div class="col-xs-6"><%= child_hostgroup.name %></div>
-          <span class="clearfix"></span>
-        </a>
+        </div>
+        <div class="col-xs-2">
+          <% if child_hostgroup.hosts.select { |h| !(!ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed?) }.count > 0 %>
+            <a href="#<%= child_hostgroup.name.parameterize.underscore %>_assigned_hosts" data-toggle="tab" class="roles_list">
+              <i class="glyphicon glyphicon-time"></i>
+              <span><%= child_hostgroup.hosts.select { |h| !(!ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed?) }.count %></span>
+            </a>
+          <% end %>
+        </div>
+        <div class="col-xs-2">
+          <a href="#<%= child_hostgroup.name.parameterize.underscore %>_free_hosts" data-toggle="tab" class="roles_list">
+            <i class="glyphicon glyphicon-plus"></i>
+          </a>
+        </div>
       </li>
     <% end %>
   </ul>
 
   <div class="tab-content col-md-8">
     <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
-      <div class="tab-pane <%= 'active' if @hostgroup == child_hostgroup %>" id="<%= child_hostgroup.name.parameterize.underscore %>">
-        <h3><%= _("Hosts") %></h3>
-        <% if child_hostgroup.own_and_free_hosts.present? %>
-          <%= form_tag(associate_host_deployment_path(id: @deployment), class: 'form-horizontal well association') do |f| %>
-            <p>
-              <%= submit_tag _("Assign / Unassign"), :class => "btn btn-primary btn-sm" %>
-            </p>
-            <%= hidden_field_tag :hostgroup_id, child_hostgroup.id %>
-            <table class="table table-bordered table-striped table-condensed">
-              <thead>
-                <tr>
-                  <th class="ca">
-                    <%= check_box_tag :check_all %>
-                  </th>
-                  <th><%= sort :name, :as => _('Name') %></th>
-                  <th class="hidden-s hidden-xs"><%= _('Deployed?') %></th>
-                  <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
-                </tr>
-              </thead>
-              <tbody>
-                <% child_hostgroup.own_and_free_hosts.each do |host| %>
-                  <tr class="<%= ['checkbox_highlight',
-                                  ('success' if child_hostgroup.host_ids.include?(host.id)),
-                                  ('deployed' if host.open_stack_deployed?)
-                                 ].compact.join(' ') %>">
-                    <td class="ca">
-                      <% disabled = ForemanTasks::Lock.locked?(@deployment, nil) && host.open_stack_deployed? %>
-                      <%= check_box_tag 'host_ids[]',
-                                        host.id,
-                                        child_hostgroup.host_ids.include?(host.id),
-                                        id:       "host_ids_#{host.id}",
-                                        disabled: disabled %>
-                      <%= hidden_field_tag 'host_ids[]', host.id if disabled %>
-                    </td>
-                    <td class="ellipsis">
-                     <%= host_label(host) %>
-                    </td>
-                    <td class="hidden-s hidden-xs">
-                      <% if host.open_stack_deployed? %>
-                        <span class="glyphicon glyphicon-cloud"></span>
-                      <% else %>
-                        <span class="glyphicon glyphicon-minus"></span>
-                      <% end %>
-                    </td>
-                    <td class="hidden-s hidden-xs"><%= host.ip %></td>
-                  </tr>
-                <% end %>
-              </tbody>
-            </table>
-          <% end %>
-        <% else %>
-          <div class="well association">
-            <div class="alert alert-warning">
-              <span class="glyphicon glyphicon-warning-sign">&nbsp;</span>
-              <%= _("All available hosts have been already assigned.") %>
-            </div>
-          </div>
-        <% end %>
-      </div>
+      <%= render :partial => "free_hosts_table", :locals => { :deployment => @deployment,
+                                                              :hostgroup => @hostgroup,
+                                                              :child_hostgroup => child_hostgroup } %>
+      <%= render :partial => "assigned_hosts_table", :locals => { :deployment => @deployment,
+                                                                  :hostgroup => @hostgroup,
+                                                                  :child_hostgroup => child_hostgroup } %>
+      <%= render :partial => "deployed_hosts_table", :locals => { :deployment => @deployment,
+                                                                  :hostgroup => @hostgroup,
+                                                                  :child_hostgroup => child_hostgroup } %>
     <% end %>
   </div>
 </div>

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

@@ -1,5 +1,8 @@
-<% title_actions link_to _("Back to Deployment"), deployment_path(@deployment.id)%>
 <% title _("%s Summary") % @deployment.name %>
+<% content_for(:title_actions) do %>
+  <%= link_to _("Advanced Configuration"), edit_deployment_path(@deployment.id)%>
+  <%= link_to _("Back to Deployment"), deployment_path(@deployment.id)%>
+<% end %>
 
 <div class="col-md-12">
   <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>

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

@@ -0,0 +1,17 @@
+<%= f.fields_for :cinder, @deployment.cinder do |p| %>
+  <%= field(p, :driver_backend, :label => _(Staypuft::Deployment::CinderService::DriverBackend::HUMAN)) do
+    @deployment.cinder.backend_labels_for_layout.map do |value, label|
+      radio_button_f_non_inline(p, :driver_backend,
+                                :checked => @deployment.cinder.driver_backend == value,
+                                :value   => value,
+                                :text    => label)
+    end.join
+  end %>
+
+  <div class="cinder_nfs_uri col-md-offset-0 hide">
+    <%= text_f p, :nfs_uri, class: "cinder_nfs_uri",
+               label:              _(Staypuft::Deployment::CinderService::NfsUri::HUMAN),
+               help_inline:        _(Staypuft::Deployment::CinderService::NfsUri::HUMAN_AFTER) %>
+
+  </div>
+<% end %>

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

@@ -0,0 +1,16 @@
+<%= f.fields_for :glance, @deployment.glance do |p| %>
+  <%= field(p, :driver_backend, :label => _(Staypuft::Deployment::GlanceService::DriverBackend::HUMAN)) do
+    @deployment.glance.backend_labels_for_layout.map do |value, label|
+      radio_button_f_non_inline(p, :driver_backend,
+                                :checked => @deployment.glance.driver_backend == value,
+                                :value   => value,
+                                :text    => label)
+    end.join
+  end %>
+
+  <div class="glance_nfs_network_path col-md-offset-0 hide">
+    <%= text_f p, :nfs_network_path, class: "glance_nfs_network_path",
+               label:                       _(Staypuft::Deployment::GlanceService::NfsNetworkPath::HUMAN),
+               help_inline:                 _(Staypuft::Deployment::GlanceService::NfsNetworkPath::HUMAN_AFTER) %>
+  </div>
+<% end %>

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

@@ -0,0 +1,57 @@
+<%= f.fields_for :neutron, @deployment.neutron do |p| %>
+  <%= change_label_width(4, field(p, :network_segmentation, :label => _(Staypuft::Deployment::NeutronService::NetworkSegmentation::HUMAN)) do
+    Staypuft::Deployment::NeutronService::NetworkSegmentation::LABELS.map do |value, label|
+      radio_button_f_non_inline(p, :network_segmentation,
+                                :checked => @deployment.neutron.network_segmentation == value,
+                                :value   => value,
+                                :text    => label)
+    end.join
+  end) %>
+
+  <div class="neutron_tenant_vlan_ranges col-md-offset-0 hide">
+    <%= change_label_width 4, text_f(p, :tenant_vlan_ranges, class: "neutron_tenant_vlan_ranges",
+                                     label:                         _(Staypuft::Deployment::NeutronService::TenantVlanRanges::HUMAN),
+                                     help_inline:                   _(Staypuft::Deployment::NeutronService::TenantVlanRanges::HUMAN_AFTER)) %>
+  </div>
+
+  <h4><%= _('Network Nodes') %> </h4>
+
+  <%= change_label_width 4, text_f(p, :networker_tenant_interface,
+                                   label:       _(Staypuft::Deployment::NeutronService::NetworkerTenantInterface::HUMAN),
+                                   help_inline: _(Staypuft::Deployment::NeutronService::NetworkerTenantInterface::HUMAN_AFTER)) %>
+
+  <%= check_box_f_non_inline(p, :use_external_interface,
+                             :checked_value   => 'true',
+                             :unchecked_value => 'false',
+                             :text            => Staypuft::Deployment::NeutronService::UseExternalInterface::HUMAN)
+  %>
+
+  <div class="neutron_external_interface col-md-offset-0 hide">
+    <%= change_label_width 4, text_f(p, :external_interface_name,
+                                     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>
+
+
+  <h4><%= _('Compute Nodes') %> </h4>
+
+  <%= change_label_width 4, text_f(p, :compute_tenant_interface,
+                                   label:       _(Staypuft::Deployment::NeutronService::ComputeTenantInterface::HUMAN),
+                                   help_inline: _(Staypuft::Deployment::NeutronService::ComputeTenantInterface::HUMAN_AFTER)) %>
+
+  <%= _('NOTE: Best practice is to use a different interface than the interface used for pxe/provisioning the node. This practice is mandatory if VLAN is chosen as the tenant network type.') %>
+
+<% end %>

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

@@ -0,0 +1,34 @@
+<%= f.fields_for :nova, @deployment.nova do |p| %>
+  <%= change_label_width(4, field(p, :network_manager, :label => _(Staypuft::Deployment::NovaService::NetworkManager::HUMAN)) do
+    Staypuft::Deployment::NovaService::NetworkManager::LABELS.map do |value, label|
+      radio_button_f_non_inline(p, :network_manager,
+                                :checked => @deployment.nova.network_manager == value,
+                                :value   => value,
+                                :text    => label)
+    end.join
+  end) %>
+
+  <div class="nova_vlan_range col-md-offset-0 hide">
+    <%= change_label_width 4, text_f(p, :vlan_range, class: "nova_vlan_range", label: _(Staypuft::Deployment::NovaService::VlanRange::HUMAN),
+                                     help_inline:           _(Staypuft::Deployment::NovaService::VlanRange::HUMAN_AFTER)) %>
+  </div>
+
+  <%= change_label_width 4, text_f(p, :public_floating_range,
+                                   label:       _(Staypuft::Deployment::NovaService::PublicFloatingRange::HUMAN),
+                                   help_inline: _(Staypuft::Deployment::NovaService::PublicFloatingRange::HUMAN_AFTER)) %>
+
+  <%= change_label_width 4, text_f(p, :private_fixed_range,
+                                   label:       _(Staypuft::Deployment::NovaService::PrivateFixedRange::HUMAN),
+                                   help_inline: _(Staypuft::Deployment::NovaService::PrivateFixedRange::HUMAN_AFTER)) %>
+
+  <h4><%= _('Compute Nodes') %> </h4>
+
+  <%= change_label_width 4, text_f(p, :external_interface_name, label: _(Staypuft::Deployment::NovaService::ExternalInterfaceName::HUMAN),
+                                   help_inline:                        _(Staypuft::Deployment::NovaService::ExternalInterfaceName::HUMAN_AFTER)) %>
+
+  <%= change_label_width 4, text_f(p, :compute_tenant_interface, label: _(Staypuft::Deployment::NovaService::ComputeTenantInterface::HUMAN),
+                                   help_inline:                         _(Staypuft::Deployment::NovaService::ComputeTenantInterface::HUMAN_AFTER)) %>
+
+  <%= _('NOTE: Best practice is to use a different interface than the interface used for pxe/provisioning the node. This practice is mandatory if VLAN is chosen as the tenant network type.') %>
+
+<% end %>

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

@@ -11,23 +11,47 @@
     <%= text_f f, :name %>
     <%= textarea_f f, :description, :rows => 3 %>
 
-    <%= field(f, :layout_id, :label => _('Deployment Layout')) do
-      @layouts.map do |layout|
-        radio_button_f_non_inline(f, :layout_id,
-                                  :checked => layout.id == @deployment.layout_id,
-                                  :value   => layout.id,
-                                  :text    => "#{layout.name}, #{layout.networking.capitalize} " + _("Networking"))
-      end.join
-    end %>
-
-    <%= field(f, :layout_id, :label => _('Messaging provider')) do
-      Staypuft::Deployment::AMQP_PROVIDER_LABELS.map do |provider_value, provider_label|
-        radio_button_f_non_inline(f, :amqp_provider,
-                                  :checked => provider_value == @deployment.amqp_provider,
-                                  :value   => provider_value,
-                                  :text    => provider_label)
-      end.join
-    end %>
+    <% { layout_name: Staypuft::Deployment::LayoutName,
+         networking:  Staypuft::Deployment::Networking,
+         # amqp_provider: Staypuft::Deployment::AmqpProvider,
+         # platform:      Staypuft::Deployment::Platform
+       }.
+           each do |attr, constants| %>
+
+      <%= field(f, attr, :label => _(constants::HUMAN)) do
+        constants::LABELS.map do |value, label|
+          radio_button_f_non_inline(f, attr,
+                                    :checked => value == @deployment.send(attr),
+                                    :value   => value,
+                                    :text    => _(label))
+        end.join
+      end %>
+    <% end %>
+
+    <%= f.fields_for :passwords, @deployment.passwords do |p| %>
+      <%= field(p, :mode, :label => _(Staypuft::Deployment::Passwords::Mode::HUMAN)) do
+        Staypuft::Deployment::Passwords::Mode::LABELS.map do |value, label|
+          radio_button_f_non_inline(p, :mode,
+                                    :checked => @deployment.passwords.mode == value,
+                                    :value   => value,
+                                    :text    => label)
+        end.join
+      end %>
+
+      <div class="single_password col-md-offset-0 hide">
+        <%= password_f p, :single_password,
+                          :label       => _("Password"),
+                          :class       => "single_password",
+                          :help_inline => _("Password should be 6 characters or more"),
+                          :placeholder => '' %>
+        <%= password_f p, :single_password_confirmation,
+                          :label       => _("Confirm"),
+                          :class       => "single_password",
+                          :placeholder => '' %>
+      </div>
+    <% end %>
+
+
 
     <div class="form_actions">
       <% if !is_new %>

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

@@ -6,44 +6,31 @@
 
     <%= deployment_wizard 3 %>
     <div class="form-group tabbed_side_nav_form row">
-      <ul class="nav nav-pills nav-stacked col-md-3" data-tabs="pills">
+      <ul class="nav nav-pills nav-stacked col-md-3 configuration" data-tabs="pills">
         <h3><%= _("Services") %></h3>
-        <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
-          <li class="<%= 'active' if i == 0 %>">
-            <a href="#<%= service.name.parameterize.underscore %>" data-toggle="tab">
-              <%= service.name %>
-            </a>
-          </li>
+        <% @services_map.each_with_index do |service_name, i| %>
+          <% service = @deployment.send(service_name)
+             if service.active?
+          %>
+            <li class="">
+              <a href="#<%= service_name  %>" data-toggle="tab">
+                <%= service_name.capitalize %>
+              </a>
+            </li>
+            <% end %>
         <% end %>
       </ul>
 
       <div class="tab-content col-md-9">
-        <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
-          <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= service.name.parameterize.underscore %>">
-            <h3><%= "#{service.name} " + _("Service Configuration") %></h3>
-            <% if (params_hash = service.ui_params_for_form(hostgroup)).size > 0 %>
-              <% params_hash.each do |param_hash| %>
-                <div class="row">
-                  <div class="col-md-4 control-label">
-                    <%= label_tag param_hash[:param_key].key %>
-                  </div>
-                  <div class="col-md-5">
-                    <%= text_field_tag format("staypuft_deployment[hostgroup_params][%s][puppetclass_params][%s][%s]",
-                                              param_hash[:hostgroup].id,
-                                              param_hash[:puppetclass].id,
-                                              param_hash[:param_key].key),
-                                       param_hash[:hostgroup].current_param_value_str(param_hash[:param_key]),
-                                       :class => "form-control",
-                                       :size  => "45" %>
-                  </div>
-                </div>
-                <br/>
-              <% end %>
-            <% else %>
-              <p><%= _("No configuration needed for this service.") %></p>
+        <% @services_map.each_with_index do |service_name, i| %>
+          <% service = @deployment.send(service_name)
+             if service.active?
+          %>
+            <div class="tab-pane" id="<%= service_name %>">
+              <h3><%= _("%s Service Configuration") % service_name.to_s.capitalize %></h3>
+              <%= render partial: service_name.to_s, locals: {f: f}%>
+            </div>
             <% end %>
-            <% # render "puppetclasses/classes_parameters", { :obj => service.hostgroups.first } %>
-          </div>
         <% end %>
       </div>
     </div>

data/app/views/staypuft/steps/{services_selection.html.erb → services_overview.html.erb}

@@ -5,7 +5,7 @@
     <%= base_errors_for @deployment %>
 
     <%= deployment_wizard 2 %>
-    <h3><%= _("Host Groups & Available Services") %></h3>
+    <h3><%= _("Deployment Roles & Available Services") %></h3>
     <h4><%= "#{@deployment.layout.name} - #{@deployment.layout.networking.capitalize} " + _("Networking") %></h4>
 
     <div class="clearfix">
@@ -13,12 +13,16 @@
           <div class="panel panel-default service-box">
             <div class="panel-heading"><strong><%= role.name %></strong></div>
             <div class="panel-body">
+              <ul>
               <% role.services.each do |service| %>
-                <%= f.label service.name.parameterize.underscore.to_sym, service.name, :class=> "checkbox inline"  do %>
-                  <%= f.check_box(service.name.parameterize.underscore.to_sym, :checked => true, :disabled => "disabled") %>
+                <li>
+                <%= f.label service.name.parameterize.underscore.to_sym, service.name, :class=> "inline"  do %>
+                  <%= f.check_box(service.name.parameterize.underscore.to_sym, :checked => true, :disabled => "disabled", :hidden=> true) %>
                   <%= service.name %>
                 <% end %>
+                </li>
               <% end %>
+              </ul>
              </div>
           </div>
         <% end %>

data/config/routes.rb

@@ -11,7 +11,9 @@ Rails.application.routes.draw do
         post 'deploy'
         get 'populate'
         get 'summary'
+        get 'edit'
         post 'associate_host'
+        post 'unassign_host'
         get 'export_config'
         post 'import_config'
       end

data/db/migrate/20140623142500_remove_amqp_provider_from_staypuft_deployment.rb

@@ -0,0 +1,6 @@
+class RemoveAmqpProviderFromStaypuftDeployment < ActiveRecord::Migration
+  def change
+    remove_column :staypuft_deployments, :amqp_provider
+    # TODO(pitr) migrate down?
+  end
+end