staypuft 0.1.9 → 0.1.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQzMDU0YjdiZTZhMzFmNWMyZWQ1OWMyZjBlZjcyNDliYTRjZThmNg==
+    ZDRmYjU0MzQ2ZTczOThmMmY3OGYzYTVlYTAzODRkZGVhZjg2Njk2ZQ==
   data.tar.gz: !binary |-
-    NTlhODNjYjdjYTY1ZDdhMDIyMGRlYWE3ZDc1NjQxMTY0YTJiZWNkMg==
+    NzQ5NGZlMTA5MmVkNjk0NGJkNWE0MjEzYmNhODc0MjI2Mjk5OWRkYw==
 SHA512:
   metadata.gz: !binary |-
-    N2EzOWE0ZTE0MWI4MTk4MjI3MDM2NzA1MDlhZjdhMWVkNzZmMzQzZTQyNDA3
-    ZTMxODUzMGI4NGRlMmM3OTdjYTBiYTgxY2NhNTM1NWU4MzM5NTE2M2IyN2Uy
-    YmYwYTkxYWYzMTI3MDFlMzhjN2FiMDVlZDNmZjZiMTgxODM2MTQ=
+    OGRiMmRhNGY2NDVkOWEyMzZhOWNhYTdkZmQxMjI1YjJhMzdiMDBmNGFhOWQ3
+    M2I5Nzg4YTJiMDIxMTdhODA2NTQ2MmRiYjI1NzMxOThjYWY5Y2I3ZjUyYmEx
+    OTRmYTJjZDUwZDIzZTdhMGExYWEwNjhkNjkyODYzOTY0Yjk4Yzc=
   data.tar.gz: !binary |-
-    MmFmY2FmODIwM2VlYjgwYTQxZmVkNzk5NzNmYTJlZTU4OTFjM2EwMjgzYmNh
-    YWVmODRkNWVmZWJiNzI2ZjBiMzMwNmFkNTdkYmE0Yjg4YzI4OWE3ZDliOTk4
-    ZTdmMmNkN2RkYjBmZTQ1MDE3MjU4ODRhYjViODhhODM3NThiZDI=
+    OWRiYTVkMGI5ZjE3MzgzOGI0MDlhOGQwM2JiNTdhYjEzYTAxNDYwYWJjYmRk
+    OGMyNzQ0NmUxZGIzYjgzZDkxZTc3YzFjMjI5ODI2NjlmMTY5MmU3YWI1ZmFl
+    YTc3N2Q3OGZiZDlkYzg2M2QwZDZkNDY3ZjU4Y2M3OTBkZGQzZWI=

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

@@ -42,6 +42,12 @@ $(function () {
     $(this).closest('.tabbed_side_nav_table').find('.activated').removeClass('activated');
   });
 
+  $('#hidden_password_toggle').click(function(e) {
+    e.preventDefault();
+    $(this).children('.glyphicon-eye-open, .glyphicon-eye-close').toggleClass('hide');
+    $(this).siblings('.hidden_password, .shown_password').toggleClass('hide');
+  });
+
   var duration = 150;
 
   showPasswords();

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

@@ -52,9 +52,9 @@ span.editable, span.editable:hover {
   }
 }
 
-// span.edit_textfield button {
-//   margin-left: 5px;
-// }
+.deployment_summary_pane {
+  padding-top: 60px;
+}
 
 .service-box {
   width: 200px;

data/app/controllers/staypuft/deployments_controller.rb

@@ -65,7 +65,7 @@ module Staypuft
     def deploy
       deployment = Deployment.find(params[:id])
       task       = ForemanTasks.async_task ::Actions::Staypuft::Deployment::Deploy, deployment
-      redirect_to foreman_tasks_task_url(id: task)
+      redirect_to deployment_path(deployment)
     end
 
     # TODO remove, it's temporary

data/app/lib/staypuft/seeder.rb

@@ -169,9 +169,6 @@ module Staypuft
       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 %>'
-      # 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 %>'
@@ -452,11 +449,11 @@ module Staypuft
               'glance_private_vip'            => vip_format % :glance,
               'glance_public_vip'             => vip_format % :glance,
               'heat_admin_vip'                => vip_format % :heat,
-              'heat_cfn_admin_vip'            => vip_format % :heat,
-              'heat_cfn_private_vip'          => vip_format % :heat,
-              'heat_cfn_public_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,
@@ -472,6 +469,7 @@ module Staypuft
               '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 %>' },

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

@@ -79,13 +79,24 @@ 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?
+        h.update 'vlan_start' => vlan_start if self.vlan_manager?
       end.to_yaml
     end
 
-    # TODO: make this dynamic
+    def vlan_range_arr
+      arr = self.vlan_range.split(':')
+    end
+
+    def vlan_start
+      vlan_range_arr[0]
+    end
+
     def num_networks
-      1
+      if self.vlan_manager?
+        vlan_range_arr[1].to_i - vlan_range_arr[0].to_i + 1
+      else
+        1
+      end
     end
 
     class Jail < Safemode::Jail

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

@@ -1,11 +1,16 @@
 module Staypuft
   class Deployment::Passwords < Deployment::AbstractParamScope
-    PASSWORD_LIST = :admin, :ceilometer_user, :cinder_db, :cinder_user,
-        :glance_db, :glance_user, :heat_db, :heat_user, :heat_cfn_user, :mysql_root,
-        :keystone_db, :keystone_user, :neutron_db, :neutron_user, :nova_db, :nova_user,
-        :swift_admin, :swift_user, :amqp, :amqp_nssdb, :keystone_admin_token,
-        :ceilometer_metering_secret, :heat_auth_encrypt_key, :horizon_secret_key,
-        :swift_shared_secret, :neutron_metadata_proxy_secret
+
+    USER_SERVICES_PASSWORDS = :admin, :ceilometer_user, :cinder_user, :glance_user, :heat_user,
+        :heat_cfn_user, :keystone_user, :neutron_user, :nova_user, :swift_user, :swift_admin, :amqp
+
+    DB_SERVICES_PASSWORDS = :cinder_db, :glance_db, :heat_db, :mysql_root, :keystone_db,
+        :neutron_db, :nova_db, :amqp_nssdb
+
+    OTHER_PASSWORDS = :keystone_admin_token, :ceilometer_metering_secret, :heat_auth_encrypt_key,
+        :horizon_secret_key, :swift_shared_secret, :neutron_metadata_proxy_secret
+
+    PASSWORD_LIST = USER_SERVICES_PASSWORDS + DB_SERVICES_PASSWORDS + OTHER_PASSWORDS
 
     OTHER_ATTRS_LIST = :mode, :single_password
 
@@ -67,5 +72,20 @@ module Staypuft
     def id # compatibility with password_f
       single_password
     end
+
+    def services_passwords(filter=nil)
+      list = case filter
+             when :user
+               USER_SERVICES_PASSWORDS
+             when :db
+               DB_SERVICES_PASSWORDS
+             else
+               PASSWORD_LIST
+             end
+
+      list.inject({}) do |h,name|
+        h.update name => single_mode? ? single_password : self.send(name)
+      end
+    end
   end
 end

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

@@ -1,7 +1,7 @@
 module Staypuft
   class Deployment::VIPS < Deployment::AbstractParamScope
 
-    VIP_NAMES = [:ceilometer, :cinder, :db, :glance, :heat, :horizon, :keystone, :loadbalancer,
+    VIP_NAMES = [:ceilometer, :cinder, :db, :glance, :heat, :heat_cfn, :horizon, :keystone, :loadbalancer,
                  :nova, :neutron, :amqp, :swift]
     COUNT     = VIP_NAMES.size
 

data/app/models/staypuft/deployment.rb

@@ -88,6 +88,14 @@ module Staypuft
 
     extend AttributeParamStorage
 
+    # Helper method for looking up a Deployment based on a foreman task
+    def self.find_by_foreman_task(foreman_task)
+      Deployment.find(ForemanTasks::Lock.where(task_id: foreman_task.id,
+                                               name: :deploy,
+                                               resource_type: 'Staypuft::Deployment')
+                                               .first.resource_id)
+    end
+
     # Returns a list of hosts that are currently being deployed.
     def in_progress_hosts(hostgroup)
       return in_progress? ? hostgroup.openstack_hosts : {}
@@ -98,6 +106,12 @@ module Staypuft
       ForemanTasks::Lock.locked? self, nil
     end
 
+    # Helper method for getting the in progress foreman task for this
+    # deployment.
+    def task
+      in_progress? ? ForemanTasks::Lock.colliding_locks(self, nil).first.task : nil
+    end
+
     # Returns all deployed hosts with no errors (default behaviour).  Set
     # errors=true to return all deployed hosts that have errors
     def deployed_hosts(hostgroup, errors=false)
@@ -202,6 +216,14 @@ module Staypuft
       networking == Networking::NEUTRON
     end
 
+    def horizon_url
+      if ha?
+        "http://#{self.vips.get(:horizon)}"
+      else
+        self.ips.controller_ips.empty? ? nil : "http://#{self.ips.controller_ip}"
+      end
+    end
+
     private
 
     def update_layout

data/app/overrides/customize_foreman_tasks_show_page.rb

@@ -0,0 +1,12 @@
+# older deface requires code prefix for erb tags
+if Gem.loaded_specs['deface'].version >= Gem::Version.new('1.0.0')
+  erb_tag = 'erb[loud]'
+else
+  erb_tag = 'code[erb-loud]'
+end
+
+Deface::Override.new(:virtual_path => "foreman_tasks/tasks/show",
+                     :name => "add_return_to_deployment_button_to_foreman_tasks",
+                     :insert_before => 'div.task-details',
+                     :partial => "staypuft/deployments/deployment_progress_page_header"
+                     )

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

@@ -0,0 +1,63 @@
+<div class="modal fade" id="all_details_modal" tabindex="-1" role="dialog" aria-labelledby="All Details" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h2 class="modal-title" id="all_details_modal_label">
+          <span class="glyphicon glyphicon-cog">
+          </span> <%= _("All Details") %>
+        </h2>
+      </div>
+      <div class="modal-body" style="max-height: 600px; overflow: auto;">
+        <div class="row">
+          <div class="col-sm-8 col-sm-offset-1">
+              <h4><%= @deployment.ha? ? _("VIP list") : _("Controller IPs") %></h4>
+              <% if @deployment.ha? %>
+                <% Staypuft::Deployment::VIPS::VIP_NAMES.each do | vip_name | %>
+                <div class="row">
+                  <label class="col-sm-4 control-label text-muted"><%= "#{vip_name}:" %></label>
+                  <div class="col-sm-8">
+                    <p class="form-control-static"><%= @deployment.vips.get(vip_name) %></p>
+                  </div>
+                </div>
+                <% end %>
+              <% else %>
+                <% @deployment.ips.controller_ips.each do |ip| %>
+                  <%= ip %>
+                <% end %>
+              <% end %>
+          </div>
+        </div>
+        
+        <div class="row">
+          <div class="col-sm-8 col-sm-offset-1">
+            <h4><%= _("User Passwords") %></h4>
+              <% @deployment.passwords.services_passwords(:user).each_pair do |user, pw| %>
+                <div class="row">
+                  <label class="col-sm-4 control-label text-muted"><%= "#{user.to_s.gsub('_', ' ').split('user')[0].capitalize}:" %></label>
+                  <div class="col-sm-8">
+                    <p class="form-control-static"><%= pw %></p>
+                  </div>
+                </div>
+              <% end %>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-8 col-sm-offset-1">
+            <h4><%= _("Database Passwords") %></h4>
+              <% @deployment.passwords.services_passwords(:db).each_pair do |user, pw| %>
+                <div class="row">
+                  <label class="col-sm-4 control-label text-muted"><%= "#{user.to_s.gsub('_', ' ').split('db')[0].capitalize}:" %></label>
+                  <div class="col-sm-8">
+                    <p class="form-control-static"><%= pw %></p>
+                  </div>
+                </div>
+              <% end %>
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+<% if @deployment = Staypuft::Deployment.find_by_foreman_task(@task) %>
+  <div style='width: 70%; display: inline-block'>
+    <h1 style='margin-top: 0'>Deployment Status</h1>
+  </div>
+  
+  <div style='display: inline-block; float: right'>
+    <% if Staypuft::Deployment.find_by_foreman_task(@task) %>
+      <%= link_to _('Return to deployment'), deployment_path(@deployment) %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,91 @@
+<div class="deployment_summary_pane">
+  <% if @deployment.deployed? %>
+    <div class="row">
+      <div class="col-sm-12 text-center"><h1 class="glyphicon glyphicon-ok text-muted"></h1></div>
+    </div>
+    <div class="row">
+      <div class="col-sm-12 text-center"><h3 class="text-muted"><%= _("Deployed") %></h3></div>
+    </div>
+    <div class="row">
+      <div class="col-sm-8 col-sm-offset-2">
+        <form class="form-horizontal">
+          <% if @deployment.horizon_url %>
+            <div class="form-group">
+              <label class="col-sm-4 control-label text-muted"><%= _("Horizon URL") %></label>
+              <div class="col-sm-8">
+                <p class="form-control-static"><%= link_to @deployment.horizon_url, @deployment.horizon_url %></p>
+              </div>
+            </div>
+          <% end %>
+          <div class="form-group">
+            <label class="col-sm-4 control-label text-muted"><%= _("Username") %></label>
+            <div class="col-sm-8">
+              <p class="form-control-static">admin</p>
+            </div>
+          </div>
+          <div class="form-group">
+            <label class="col-sm-4 control-label text-muted"><%= _("Password") %></label>
+            <div class="col-sm-8">
+              <p class="form-control-static">
+                <span class="shown_password hide"><%= @deployment.passwords.admin %></span>
+                <span class="hidden_password">********</span>
+                <a href="" id="hidden_password_toggle">
+                  <span class="glyphicon glyphicon-eye-open"></span>
+                  <span class="glyphicon glyphicon-eye-close hide"></span>
+                </a>
+              </p>
+            </div>
+          </div>
+        </form>
+        <div class="row text-center">
+          <%= link_to(_("Access all details"), "", :'data-toggle' => "modal", :'data-target' => "#all_details_modal", :class => "btn btn-default") %>
+        </div>
+      </div>
+    </div>
+  <% elsif @deployment.in_progress? %>
+    <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>
+    </div>
+    <div class="row">
+      <div class="col-sm-12 text-center">
+        <% if @deployment.task %>
+          <%= display_link_if_authorized(
+              _('Show more details'),
+              hash_for_foreman_tasks_task_path(id: @deployment.task.id)) %>
+        <% else %>
+          <%= _("Deployment task has been unlocked") %>
+        <% end %>
+      </div>
+    </div>
+  <% else %>
+    <div class="row">
+      <div class="col-sm-12 text-center"><h3 class="text-muted"><%= _("Not deployed, yet.") %></h3></div>
+    </div>
+  <% end %>
+</div>

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

@@ -60,7 +60,11 @@
         <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>
+              <% unless @deployment.in_progress? %>
+                <i class="glyphicon glyphicon-time"></i>
+              <% else %>
+                <%= image_tag '/assets/spinner.gif' %>
+              <% end %>
               <span><%= child_hostgroup.hosts.select { |h| !(!ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed?) }.count %></span>
             </a>
           <% end %>
@@ -86,6 +90,7 @@
                                                                   :hostgroup => @hostgroup,
                                                                   :child_hostgroup => child_hostgroup } %>
     <% end %>
+    <%= render :partial => "deployment_summary", :locals => { :deployment => @deployment } %>
   </div>
 </div>
 
@@ -101,6 +106,15 @@
       </div>
       <div class="modal-body">
         <%= (_("This action will initiate the deployment of %s ") % "<strong>#{@deployment.name}</strong>").html_safe %>
+        <div class="deploy-changes">
+          <strong><%= _("Resulting OpenStack Deployment") %>:</strong>
+          <% @deployment.child_hostgroups.deploy_order.each do |child_hostgroup| %>
+            <div <%= "class=text-muted".html_safe if child_hostgroup.hosts.count == 0 %>>
+              <strong><%= "#{child_hostgroup.hosts.count} x" %></strong>
+              <%= "#{child_hostgroup.name}" %>
+            </div>
+          <% end %>
+        </div>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
@@ -113,3 +127,5 @@
     </div>
   </div>
 </div>
+<%= render :partial => "deployment_access_all_details_dialogue", :locals => { :deployment => @deployment } %>
+

data/lib/staypuft/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Staypuft team
@@ -78,6 +78,7 @@ files:
 - Rakefile
 - 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
@@ -125,9 +126,13 @@ files:
 - 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/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
@@ -199,10 +204,9 @@ 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/test_plugin_helper.rb
+- test/factories/staypuft_factories.rb
+- test/integration/navigation_test.rb