staypuft 0.5.18 → 0.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa1fc0e43ac4f94ddae7be23c7941b1d22c74b8
-  data.tar.gz: 7e4e4d1e9529729d3242e90e3fb98e934fb529d2
+  metadata.gz: 33b797789ba713b33c1db4e2a09d4feec861bfb4
+  data.tar.gz: a9f26aee683a285766a58ce98d6164cb3d575d26
 SHA512:
-  metadata.gz: a71e8eba640b5a17c09a4524d26154e258ff1c00ca78e8d3f685996aa34b952028f75cfeaa5e955e7d5157d4d258a43c3dfbb91f27f21c201775d3d24b4f4146
-  data.tar.gz: f237025c2388b22842315478a46c834cc04c9f490eb5c494be8c9f89a788956f90fa1f85517952f3dda8b9f73f5ae13b72a2c8aeccbcd48c608f79ea9103f14d
+  metadata.gz: e94ea349578792352fa803ecd4a5f51a5281a44689f514338086c105455292c7b1b8fe93b5d34466ca020df2dde81a2fd25ab51a4348b9e71bb3df154b320cf8
+  data.tar.gz: b7ef4a76c194540fca97a676ef6cffbb015227f2c418738a72186ee1aab17d88bd09c4f46dfd8c20122f43584069e909fa1ec99c56c80860c2d65a022f64015b

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

@@ -217,6 +217,7 @@ h3[data-toggle="collapse"] {
     margin-bottom: 0;
     .control-label {
       text-align: left;
+      clear: left;
     }
     .help-block {
       margin-bottom: 0;

data/app/lib/actions/staypuft/host/trigger_provisioning.rb

@@ -20,9 +20,12 @@ module Actions
         def plan(host)
           fail 'cannot provision unmanaged host' unless host.managed?
 
-          # return back to hostgroup's environment
           sequence do
-            plan_action Actions::Staypuft::Host::Update, host, :environment => nil
+            # set the env to 'provisioning' to avoid compiling the
+            # production catalog when actually not applying it, which
+            # might cause errors
+            plan_action Actions::Staypuft::Host::Update, host,
+                        :environment_id => Environment.get_or_create_provisioning.id
             plan_self host_id: host.id
           end
         end

data/app/lib/staypuft/seeder.rb

@@ -65,14 +65,18 @@ module Staypuft
 
     # some services don't have puppetclasses yet, since they aren't broken out on the back end
     SERVICES       = {
-        :cinder_node        => { :name => 'Cinder (node)', :class => ['quickstack::storage_backend::cinder'] },
-        :nova_compute       => { :name => 'Nova-compute', :class => ['quickstack::nova_network::compute'] },
-        :neutron_compute    => { :name => 'Neutron-compute', :class => ['quickstack::neutron::compute'] },
+        :cinder_node        => { :name => 'Cinder (node)', :class => ['quickstack::storage_backend::cinder',
+                                                                      'quickstack::ntp'] },
+        :nova_compute       => { :name => 'Nova-compute', :class => ['quickstack::nova_network::compute',
+                                                                     'quickstack::ntp'] },
+        :neutron_compute    => { :name => 'Neutron-compute', :class => ['quickstack::neutron::compute',
+                                                                        'quickstack::ntp'] },
         :swift_node         => { :name => 'Swift (node)', :class => ['quickstack::swift::storage'] },
         :controller         => { :name  => 'Controller',
                                  :class => ['quickstack::openstack_common',
                                             'quickstack::pacemaker::common',
-                                            'quickstack::pacemaker::params'] },
+                                            'quickstack::pacemaker::params',
+                                            'quickstack::ntp'] },
         :keystone           => { :name  => 'Keystone',
                                  :class => ['quickstack::pacemaker::keystone'] },
         :load_balancer      => { :name  => 'Load Balancer',
@@ -84,18 +88,21 @@ module Staypuft
         :nova               => { :name => 'Nova', :class => ['quickstack::pacemaker::nova'] },
         :heat               => { :name => 'Heat', :class => ['quickstack::pacemaker::heat'] },
         :cinder             => { :name => 'Cinder', :class => ['quickstack::pacemaker::cinder'] },
-        :swift              => { :name => 'Swift', :class => ['quickstack::pacemaker::swift'] },
+        :swift              => { :name => 'Swift', :class => ['quickstack::pacemaker::swift',
+                                                              'quickstack::ntp'] },
         :horizon            => { :name => 'Horizon', :class => ['quickstack::pacemaker::horizon'] },
         :galera             => { :name => 'Galera', :class => ['quickstack::pacemaker::galera'] },
         :mysql              => { :name => 'Mysql', :class => ['quickstack::pacemaker::mysql'] },
         :ceilometer         => { :name => 'Ceilometer', :class => ['quickstack::pacemaker::nosql',
                                                                         'quickstack::pacemaker::ceilometer'] },
         :neutron            => { :name => 'Neutron', :class => ['quickstack::pacemaker::neutron'] },
-        :generic_rhel_7     => { :name => 'Generic RHEL 7', :class => ['quickstack::openstack_common'] },
+        :generic_rhel_7     => { :name => 'Generic RHEL 7', :class => ['quickstack::openstack_common',
+                                                                       'quickstack::ntp'] },
         :ceph_osd           => { :name => 'Ceph Storage (OSD) (node)',
                                  :class => ['quickstack::openstack_common',
                                             'quickstack::ceph::config',
-                                            'quickstack::firewall::ceph_osd'] },
+                                            'quickstack::firewall::ceph_osd',
+                                            'quickstack::ntp'] },
     }
 
     # The list of roles is still from astapor
@@ -347,6 +354,8 @@ module Staypuft
       ceph_osd_pool_size       = { :string => '<%= @host.deployment.ceph.osd_pool_size %>' }
       ceph_osd_journal_size    = { :string => '<%= @host.deployment.ceph.osd_journal_size %>' }
 
+      # NTP
+      ntp_servers              = { :array => "<%= @host.params['ntp-servers'].split(',') %>" }
 
       # effective_value grabs shared password if deployment is in shared password mode,
       # otherwise use the service-specific one
@@ -687,6 +696,9 @@ module Staypuft
           },
           'quickstack::pacemaker::ceilometer' => {
               'ceilometer_metering_secret' => ceilometer_metering,
+          },
+          'quickstack::ntp' => {
+              'servers' => ntp_servers,
           }
       }
     end

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

@@ -8,5 +8,9 @@ module Staypuft::Concerns::EnvironmentExtensions
                 'missing discovery environment, which ensures all its machines are booted ' +
                     'to discovery image.'
     end
+
+    def get_or_create_provisioning
+      where(name: 'provisioning').first_or_create
+    end
   end
 end

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

@@ -202,14 +202,23 @@ module Staypuft
       end
     end
 
-    %w{hostname login password server_port storage_familie transport_type storage_protocol
-        nfs_share nfs_shares_config volume_list vfiler vserver controller_ip sa_password 
-        storage_pool }.each do |name|
+    %w{hostname login password server_port transport_type storage_protocol
+        nfs_shares_config volume_list vfiler vserver sa_password }.each do |name|
       define_method "compute_netapp_#{name}s" do
         self.netapps.collect { |e| e.send name }
       end
     end
 
+    %w{controller_ips nfs_shares storage_pools}.each do |name|
+      define_method "compute_netapp_#{name}" do
+        self.netapps.collect { |e| e.send name }
+      end
+    end
+
+    def compute_netapp_storage_families
+      self.netapps.collect { |e| e.send :storage_family }
+    end
+
     private
 
     def set_lvm_ptable

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.18'
+  VERSION = '0.5.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.5.19
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks