vagrant-em-demos 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21c3e538f2ab4b80fa8a4cbf1dcdaed90e7e5fc560d69f9ed7296b35927c601a
-  data.tar.gz: 492105d1889db7d7ac78a3845600f501c02f178c255875338a8c49bf3c8a750e
+  metadata.gz: d93441ea0a868529a8c1a23ca4a1e707eae1b6f9b5e876444a0c3fc307f5b5a6
+  data.tar.gz: fd57329ddbdd16ac09af4ddc27c9490527861372f2180d2f6ea2d414dbe07b26
 SHA512:
-  metadata.gz: eb4d0df0a36f2cad0919bfb2f9c6c0830cd93bd97a9adf3dc6f91a8b0af15edb6e88f337324840f06b912c54ff19bef35adf16d14b64aa75cf0eecc7317a0c2c
-  data.tar.gz: 51534f0bf9994a5e92cbb5595b66e0df8194baca7e699da6326a0f998c997c4898a0184121df920daabab684d99300bb3140815f0a4cbd0c94921d11c8319139
+  metadata.gz: f444b085abd617f086ff33f7cf07f08922150d33e2738464f9205c7762ec485681a0f5ef59eb1ed655586b352868b00c52a41acb4b8125c6eb296237032109d1
+  data.tar.gz: dc56f114fbccfba673747ebb869fd356683f3d6a35615142954d68f643e4d78b99a95a766cde4d9c4655f2154d834bab7ce365e2f9dc263725504732d6f53f65

data/lib/vagrant/em/demos/config_reader.rb

@@ -4,6 +4,7 @@ module Vagrant
   class ConfigReader
     VALID_KEYS = [
       "dhcp_fix",
+      "own_dns"
       "public_ip",
       "private_ip",
       "domain_name",

data/lib/vagrant/em/demos/defaults.yaml

@@ -13,6 +13,7 @@ defaults:
   virtualboxorafix: false
   required_plugins: []
   run_r10k:         true
+  own_dns:          false
   custom_facts:
     deployment_zone: vagrant
 #

data/lib/vagrant/em/demos/models.rb

@@ -33,7 +33,7 @@ module Vagrant
         :protocol, :disks, :additional_hosts, :custom_facts,
         :required_plugins, :software_files, :needs_storage,
         :virtualboxorafix, :dhcp_fix, :cluster, :run_r10k, :mount_uid,
-        :mount_gid, :prefix, :ip_start_address, :ipaddress
+        :mount_gid, :prefix, :ip_start_address, :ipaddress, :own_dns
       ]
       attr_reader(*ATTRIBUTES)
       attr_accessor :generated_ip, :index, :vmname
@@ -51,13 +51,13 @@ module Vagrant
         end
         @name = name
         @index = index
-        if ip_start_address
+        if public_ip
+          @ipaddress = @public_ip
+        else
+          fail "public_ip or ip_start_address is required for #{name}" unless ip_start_address
           adress_manager = VagrantPlugins::AdressManager.instance(ip_start_address)
           @generated_ip = adress_manager.register_node(fqdn)
           @ipaddress = @generated_ip
-        else
-          fail "priate_ip or ip_start_address is required"
-          @ipaddress = @private_ip
         end
 
         initialize_disks(attributes["disks"])

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
@@ -99,11 +128,23 @@ 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
 
+      # Fix setup for Oracle applications
+      def virtualboxorafix(vb)
+        vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/Leaf', '0x4']
+        vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/SubLeaf', '0x4']
+        vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/eax', '0']
+        vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/ebx', '0']
+        vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/ecx', '0']
+        vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/edx', '0']
+        vb.customize ['setextradata', :id, 'VBoxInternal/CPUM/HostCPUID/Cache/SubLeafMask', '0xffffffff']
+      end
+
       # Configure VirtualBox disks attached to the virtual machine
       def configure_disks(vb, model)
         vminfo = vm_info(model.name)
@@ -268,10 +309,15 @@ module Vagrant
           vb.cpus = model.cpucount || 1
           vb.memory = model.ram || 4096
           vb.name = model.vmname
-          vb.auto_nat_dns_proxy = false
-          vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
-          vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-
+          if model.own_dns
+            vb.auto_nat_dns_proxy = false
+            vb.customize ["modifyvm", :id, "--natdnsproxy1", "off"]
+            vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off"]
+          else
+            vb.auto_nat_dns_proxy = true
+            vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+            vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+          end
           virtualboxorafix(vb) if model.virtualboxorafix
 
           configure_disks(vb, model) if model.needs_storage

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/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.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Enterprise Modules
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-19 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