Added progress messages to capture conf

Author: lhoffl

environments/production/manifests/site.pp

@@ -16,6 +16,7 @@
 node default {
   case $facts['os']['name'] {
     /[Rr]ed[Hh]at|[Cc]ent[OS|os]/:  {include std_centos }
+    /[Uu]buntu/:                    {include std_ubuntu }
     /[Dd]arwin/:                    {include std_mac    }
     /[Ww]indows/:                   {include std_windows}
     default:                        {include common     }
@@ -26,34 +27,27 @@
   include common
 }
 
-node szabo1 {
-  include common
-  include graylog
-  include sssd
-  include mount_drives
-  include privileges
-}
-
-node /matt/ {
-  include common
-  include sssd
-  include graylog
-}
-
 node /biobankdb/ {
     include common
     include sssd
     include graylog
     include dummy_login
 }
 
-# Matches all of the lens machines for Huilin's team
-node /^lens\d+$/ {
-  include research_centos
+node /cryo[-_]em[_-]linux\d+/ {
+  include cryoem
+  include pymol_module
 }
 
 node foreman {
   include centos_server
+
+  # backup and replace all configurations monthly
+  cron { 'cleanfb_monthly': 
+    command  => '/usr/bin/yes | /usr/local/bin/cleanfb --name=vai',
+    user     => 'root',
+    monthday => 1,
+  }
 }
 
 node gongpuvictory {
@@ -62,8 +56,22 @@
   include research_centos
 }
 
-# matches all of the cryoEM machines
-node /cryo[-_]em[_-]linux\d+/ {
-  include cryoem
-  include pymol_module
+node /^lens\d+$/ {
+  include research_centos
+}
+
+node /matt/ {
+  include common
+  include sssd
+  include graylog
 }
+
+
+node szabo1 {
+  include common
+  include graylog
+  include sssd
+  include mount_drives
+  include privileges
+}
+

environments/production/modules/common/lib/facter/adjoin.rb

@@ -15,8 +15,8 @@
 def joined (os)
   case os
   when "darwin" then return ((`dsconfigad -show | awk '/Active Directory Domain/{print $NF}'`).include? $host)
-  when "redhat","centos" then return sssd_status
-  when "windows" then return true
+  when "redhat","centos", "ubuntu" then return sssd_status
+  when "windows" then return ((`wmic computersystem get domain`).include? $domain)
   else  Puppet.notice("Error in AD join. #{os} not currently supported through Puppet.")
   end
 
@@ -37,9 +37,16 @@ def adjoin (os)
   case os
   when "darwin" 
     (`dsconfigad -add #{$host} -u #{$ad_admin} -p #{$ad_admin_pass} -domain #{$domain}`)
-  when "redhat","centos"
+  when "redhat","centos", "ubuntu"
 	(`/usr/bin/net ads join -U #{$ad_admin}%#{$ad_admin_pass} createcomputer=LinuxMachines`)
     (`/usr/sbin/authconfig --enablesssd --enablesssdauth --enablemkhomedir --updateall`)
+  when "windows"
+    return
+    $user = "$domain\$ad_admin"
+    $password = (`ConvertTo-SecureString -AsPlainText $ad_admin_pass -Force`)
+
+    credential = (`New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList $user,$password`)
+    (`Add-Computer -DomainName "$domain" -Credential $credential -Restart -Force`)
   end
 end
 

environments/production/modules/common/lib/facter/capture_conf.rb

@@ -16,7 +16,7 @@ class Configuration
   def initialize
     @os             = facter_call(:operatingsystem).downcase
     @fqdn           = facter_call(:fqdn).downcase
-    
+
     @filepath       = (@os.include? "windows") ? @@WINDOWS_PATH : @@LINUX_PATH
     prefix          = "#{@filepath+@fqdn}"
     @config_file    = prefix + "_configuration.json"
@@ -36,6 +36,7 @@ def run
   private
 
   def capture_configuration
+
     puppet_call(:notice, "Capturing current configuration...")
 
     json = []
@@ -61,8 +62,11 @@ def compare_configuration
     sum = Digest::MD5.file @config_file
     response = filebucket_request(:get, sum: sum)
 
-    File.delete(@config_file) if(response.nil? || response.empty?)
-  
+    if(response.nil? || response.empty?)
+      File.delete(@config_file)
+      return
+    end
+
     saved_configuration = JSON.parse(File.read(@config_file))
     current_configuration = JSON.parse(@configuration)
 
@@ -175,31 +179,37 @@ def puppet_call(type, val)
   def restore_configuration
     list = filebucket_request(:list)
     restored = false
-
     unless(list.nil? || list.empty?)
       cached_files = list.split("\n")
 
+      counter = 1.0
+      size = cached_files.size
+      puppet_call(:notice, "No configuration found at #{@config_file}. ")
+      puppet_call(:notice, "Searching for cached configuration: ")
+      
       cached_files.reverse_each do |line|
         next if(!(line.include? @config_file) || restored)
 
+        progress = (((counter / size).round(2)) * 100).truncate
+        puppet_call(:notice, "#{progress}%")
+        counter += 1
+
         sum = line.split(" ")[0]
         response = filebucket_request(:get, sum: sum)
 
         unless(response.nil? || response.empty? || restored)
 
           restored = true
           filebucket_request(:restore, file: @config_file, sum: sum)
-          puppet_call(:notice, 
-                      "Restored #{@config_file} from #{@@SERVER} (#{sum})")
-        
+          puppet_call(:notice, "Restored #{@config_file} from #{@@SERVER} (#{sum})")
         end
       end 
     end
 
     if !(restored)
-      puppet_call(:notice, "No configuration found at #{@config_file}. "\
-                  "Capturing a new configuration.")
       save
+      puppet_call(:notice, "No cached configuration found on server.")
+      puppet_call(:notice, "Capturing a new configuration...")
     end
   end
 

environments/win_test/manifests/site.pp

@@ -2,13 +2,30 @@
 
 node windev1806eval {
   include chocolatey
+  include common
   package { 'git':
       ensure   => latest,
       provider => 'chocolatey',
   }
 
   package { 'office365business':
-      ensure   => absent,
+      ensure   => latest,
       provider => 'chocolatey',
   }
+
+  package { 'notepadplusplus':
+    ensure   => latest,
+    provider => 'chocolatey',
+  }
+
+  package { 'spotify':
+    ensure   => absent,
+    provider => 'chocolatey',
+  }
+
+  package { 'slack':
+    ensure   => latest,
+    provider => 'chocolatey',
+  }
+
 }