vagrant-em-demos 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f385ca856f975c9f6909252cbe797b70b84633fafd9bda8d488f95284dbcee
-  data.tar.gz: caf5c2e2c578904372fa3f0d5d6593f2a269a73412dadbfdde63979bd74f3b18
+  metadata.gz: f4a5fd66288ee40ae7d33f431cddf6fb61c3774a245819b2283787da1fe41703
+  data.tar.gz: ea221549e9633223c828483fd03bb47d1122de446c6c2065f7a8343f5fb22413
 SHA512:
-  metadata.gz: 0c09a1f155ff3decd1bd47f3dc961b6b855c7a460c5d3217edb70744ccb47d9c1960c7dc1d875034f851380b2a28e17b4538df7a3b1400f644d4538aa7378ce2
-  data.tar.gz: f4a231c1a5c963bcf9e6d0d17cc18c90240662815847a20268366ad3c4d8c8eb1ec12306e3b8a10dbfa8b8a34716666cc4f027ce998060f99984d2bd8168cee5
+  metadata.gz: ebd25994d52628f7e8ba12888575f0f50028a9223b5e691deeceb20deb52737f535286b803a611c8ca9bf24018867f7316f8e6eecb7dc9b09340a0f2d352ab8f
+  data.tar.gz: e3307eb2d5d9038c2fa97055f48d2659f3566d1a1fd853806750b15692693eab3bc4fa4f5c2cb0204a81e01d970417f4ea5561539ff4097166c0ffe7075024c0

data/lib/vagrant/em/demos/types/base.rb

@@ -23,10 +23,11 @@ module Vagrant
         configure_networking(@config, @vm, @model)
         if @model.protocol == "ssh"
           add_inline_shell_provisioner(hosts_file(@models, "linux"),"hosts_file")
+          add_inline_shell_provisioner(facter_overrides(@model.custom_facts, "linux"), 'facter_overrides') if @model.custom_facts
         else
           add_inline_shell_provisioner(hosts_file(@models, "windows"),"hosts_file")
+          facter_overrides(@model.custom_facts, "windows") if @model.custom_facts
         end
-        add_inline_shell_provisioner(facter_overrides(@model.custom_facts, "linux"), 'facter_overrides') if @model.custom_facts
       end
 
       # Return a shell command that ensures that all vagrant hosts are in /etc/hosts
@@ -51,26 +52,54 @@ module Vagrant
           end
           commands << "echo 127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4 >> /etc/hosts"
         else
-          commands = 'puppet apply c:\vagrant\windows_hosts_file.pp'
-          win_hosts = ""
-          vms.each do |vm|
-            hostname = vm.hostname
-            domain = vm.domain_name
-            fqdn = "#{hostname}.#{domain}"
-            win_hosts << "host { '#{fqdn}': ip => '#{vm.ipaddress}', host_aliases => '#{hostname}' }\n" if vm.ipaddress
-            vm.additional_hosts&.each do |host|
-              fqdn = "#{host.name}.#{host.domain_name}"
-              win_hosts << "host { '#{fqdn}': ip => '#{host.ip}', host_aliases => '#{host.name}' }\n"
-            end
+        # Create a PowerShell script with all commands
+        script_content = <<-EOT
+        # Remove existing 127.0.*.1 entries
+        $content = Get-Content 'C:\\Windows\\System32\\drivers\\etc\\hosts'
+        $newContent = $content | Where-Object { $_ -notmatch '127\\.0\\..*\\.1.*' }
+        $newContent | Set-Content 'C:\\Windows\\System32\\drivers\\etc\\hosts'
+        EOT
+        
+        # Add each VM host entry
+        vms.each do |vm|
+          hostname = vm.hostname
+          domain = vm.domain_name
+          fqdn = "#{hostname}.#{domain}"
+          if vm.ipaddress
+            script_content += <<-EOT
+              # Add entry for #{fqdn}
+              if (-not (Select-String -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Pattern '#{fqdn}' -Quiet)) { 
+                Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '#{vm.ipaddress} #{fqdn} #{hostname}'
+              }
+            EOT
+          end
+          
+          # Add additional hosts
+          vm.additional_hosts&.each do |host|
+            fqdn = "#{host.name}.#{host.domain_name}"
+            script_content += <<-EOT
+            # Add entry for #{fqdn}
+            if (-not (Select-String -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Pattern '#{fqdn}' -Quiet)) { 
+              Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '#{host.ip} #{fqdn} #{host.name}'
+            }
+            EOT
           end
-          win_hosts = win_hosts.split("\n").uniq.join("\n")
-          File.write(File.join(Dir.pwd, "windows_hosts_file.pp"), win_hosts)
+        end
+        # Add localhost entry at the end
+        script_content += <<-EOT
+        # Add localhost entry
+        Add-Content -Path 'C:\\Windows\\System32\\drivers\\etc\\hosts' -Value '127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4'
+        EOT
+          
+          # Set the commands to just run this script
+          commands = script_content
         end
         commands
       end
 
       def add_inline_shell_provisioner(command, name=nil, env = nil)
         provisioner = {shell: {inline: command}}
+        provisioner[:shell][:privileged] = true
         provisioner[:shell][:env] = env if env
         provisioner[:shell][:name] = name if name
         @provisioners << provisioner
@@ -90,6 +119,7 @@ module Vagrant
       def environment_variables
         env = {}
         env.merge!("CI_TOKEN" => ENV["CI_JOB_TOKEN"]) if ENV["CI_JOB_TOKEN"]
+        env.merge!("RUN_R10K" =>  @model.run_r10k)
         env
       end
 
@@ -98,8 +128,9 @@ module Vagrant
           facter_overrides = facts.map { |key, value| "export FACTER_#{key}=\\\"#{value}\\\"" }.join('\n')
           'echo -e "' + facter_overrides + '" > /etc/profile.d/facter_overrides.sh'
         else
-          facter_overrides = facts.map { |key, value| "Write-Host #{key}=#{value}" }.join("`r")
-          'echo "' + facter_overrides + '" > C:\ProgramData\PuppetLabs\facter\facts.d\facter_overrides.ps1'
+          facts.each do |key, value|
+            add_inline_shell_provisioner("[Environment]::SetEnvironmentVariable(\"FACTER_#{key}\", \"#{value}\", \"Machine\")")
+          end
         end
       end
 

data/lib/vagrant/em/demos/types/masterless.rb

@@ -20,14 +20,11 @@ module Vagrant
       end
 
       def setup_windows
-        add_shell_script_provisioner(facter_overrides(@model.custom_facts, "windows"), "always") if @model.custom_facts
-        add_shell_script_provisioner(hosts_file(@models, "windows"))
-        add_shell_script_provisioner(%(Set-ExecutionPolicy Bypass -Scope Process -Force
-                                cd c:\\vagrant\\vm-scripts
-                                .\\install_puppet.ps1
-                                cd c:\\vagrant\\vm-scripts
-                                .\\setup_puppet.ps1
-                                iex "& 'C:\\Program Files\\Puppet Labs\\Puppet\\bin\\puppet' resource service puppet ensure=stopped"))
+        configure_synced_folders(@config, @vm, @model, @model.mount_uid, @model.mount_gid)
+        facter_overrides(@model.custom_facts, "windows") if @model.custom_facts
+        add_shell_script_provisioner("install_puppet.ps1", [], environment_variables)
+        add_shell_script_provisioner("setup_puppet.ps1", [], environment_variables)
+        add_shell_script_provisioner("stop_puppet_service.ps1", [], environment_variables)
         add_puppet_provisioner(["vm", "c:\\vagrant\\manifests"], "site.pp", "--test")
       end
 

data/vm-scripts/setup_puppet.sh

@@ -29,13 +29,19 @@ else
     echo "Using released versions of modules..."
     PUPPETFILE="Puppetfile"
   fi
-  #
-  # Check if the Puppetfile exists before installing
-  #
-  if [ -f ${PUPPETFILE} ]; then
-    /opt/puppetlabs/puppet/bin/r10k puppetfile install --puppetfile ${PUPPETFILE} --force > /dev/null # 2>&1
+
+  # Check if RUN_R10K is set to true before proceeding
+  if [ "$RUN_R10K" = "true" ]; then
+    #
+    # Check if the Puppetfile exists before installing
+    #
+    if [ -f ${PUPPETFILE} ]; then
+      /opt/puppetlabs/puppet/bin/r10k puppetfile install --puppetfile ${PUPPETFILE} --force > /dev/null # 2>&1
+    else
+      echo "Warning: ${PUPPETFILE} not found. Proceeding without module installation."
+    fi
   else
-    echo "Warning: ${PUPPETFILE} not found. Proceeding without module installation."
+    echo "RUN_R10K is not set to true. Skipping r10k puppetfile install."
   fi
 
   #

data/vm-scripts/stop_puppet_service.ps1

@@ -0,0 +1 @@
+iex "& 'C:\\Program Files\\Puppet Labs\\Puppet\\bin\\puppet' resource service puppet ensure=stopped"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-em-demos
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Enterprise Modules
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -85,7 +85,7 @@ files:
 - vm-scripts/run_puppet.ps1
 - vm-scripts/setup_puppet.ps1
 - vm-scripts/setup_puppet.sh
-- vm-scripts/setup_puppet_raw.ps1
+- vm-scripts/stop_puppet_service.ps1
 homepage: https://github.com/enterprisemodules/vagrant-em-demos
 licenses:
 - MIT
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Custom provisioning Enterprise Modules demo's

data/vm-scripts/setup_puppet_raw.ps1

@@ -1 +0,0 @@
-# To be implemented