Fixes #31059 - regenerate snapshots without environment

ezr-ondrej · May 23, 2021 · 6df37ec · 6df37ec
1 parent d00660c
commit 6df37ec
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 71 deletions.
diff --git a/...n/renderer/snapshots/ProvisioningTemplate/cloud-init/CloudInit_default.host4dhcp.snap.txt b/...n/renderer/snapshots/ProvisioningTemplate/cloud-init/CloudInit_default.host4dhcp.snap.txt
@@ -90,10 +90,7 @@ runcmd:
   [agent]
   pluginsync      = true
   report          = true
-  ca_server       = localhost
   certname        = snapshot-ipv4-dhcp-el7
-  server          = localhost
-  environment     = test
 
   EOF
 
@@ -105,7 +102,7 @@ runcmd:
   # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
   export FACTER_is_installer=true
   # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-  /usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime  --server localhost --no-daemonize
+  /usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime   --no-daemonize
 phone_home:
   url: http://foreman.some.host.fqdn/unattended/built
   post: []

diff --git a/...enderer/snapshots/ProvisioningTemplate/finish/Alterator_default_finish.host4dhcp.snap.txt b/...enderer/snapshots/ProvisioningTemplate/finish/Alterator_default_finish.host4dhcp.snap.txt
@@ -29,13 +29,10 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 EOF
 
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf -o --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf -o --tags no_such_tag --server  --no-daemonize
 /sbin/chkconfig puppetd on
 
 if [ -x /usr/bin/curl ]; then

diff --git a/...renderer/snapshots/ProvisioningTemplate/finish/FreeBSD_(mfsBSD)_finish.host4dhcp.snap.txt b/...renderer/snapshots/ProvisioningTemplate/finish/FreeBSD_(mfsBSD)_finish.host4dhcp.snap.txt
@@ -41,10 +41,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -56,7 +53,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/...enderer/snapshots/ProvisioningTemplate/finish/Kickstart_default_finish.host4dhcp.snap.txt b/...enderer/snapshots/ProvisioningTemplate/finish/Kickstart_default_finish.host4dhcp.snap.txt
@@ -89,10 +89,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -104,7 +101,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/.../renderer/snapshots/ProvisioningTemplate/finish/Preseed_default_finish.host4dhcp.snap.txt b/.../renderer/snapshots/ProvisioningTemplate/finish/Preseed_default_finish.host4dhcp.snap.txt
@@ -52,10 +52,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -67,7 +64,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/...enderer/snapshots/ProvisioningTemplate/provision/AutoYaST_SLES_default.host4dhcp.snap.txt b/...enderer/snapshots/ProvisioningTemplate/provision/AutoYaST_SLES_default.host4dhcp.snap.txt
@@ -130,10 +130,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -145,7 +142,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/...man/renderer/snapshots/ProvisioningTemplate/provision/AutoYaST_default.host4dhcp.snap.txt b/...man/renderer/snapshots/ProvisioningTemplate/provision/AutoYaST_default.host4dhcp.snap.txt
@@ -132,10 +132,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -147,7 +144,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/...enderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4and6dhcp.snap.txt b/...enderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4and6dhcp.snap.txt
@@ -141,10 +141,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-6-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -156,7 +153,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/...an/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4dhcp.snap.txt b/...an/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4dhcp.snap.txt
@@ -141,10 +141,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -156,7 +153,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/.../renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4static.snap.txt b/.../renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host4static.snap.txt
@@ -141,10 +141,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-static-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -156,7 +153,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/...an/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6dhcp.snap.txt b/...an/renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6dhcp.snap.txt
@@ -141,10 +141,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv6-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -156,7 +153,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/.../renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6static.snap.txt b/.../renderer/snapshots/ProvisioningTemplate/provision/Kickstart_default.host6static.snap.txt
@@ -141,10 +141,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv6-static-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -156,7 +153,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/...it/foreman/renderer/snapshots/ProvisioningTemplate/snippet/puppet.conf.host4dhcp.snap.txt b/...it/foreman/renderer/snapshots/ProvisioningTemplate/snippet/puppet.conf.host4dhcp.snap.txt
@@ -7,7 +7,4 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
diff --git a/...t/foreman/renderer/snapshots/ProvisioningTemplate/snippet/puppet_setup.host4dhcp.snap.txt b/...t/foreman/renderer/snapshots/ProvisioningTemplate/snippet/puppet_setup.host4dhcp.snap.txt
@@ -14,10 +14,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -29,4 +26,4 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
diff --git a/...er/snapshots/ProvisioningTemplate/user_data/AutoYaST_default_user_data.host4dhcp.snap.txt b/...er/snapshots/ProvisioningTemplate/user_data/AutoYaST_default_user_data.host4dhcp.snap.txt
@@ -64,10 +64,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -79,7 +76,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/...r/snapshots/ProvisioningTemplate/user_data/Kickstart_default_user_data.host4dhcp.snap.txt b/...r/snapshots/ProvisioningTemplate/user_data/Kickstart_default_user_data.host4dhcp.snap.txt
@@ -98,10 +98,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -113,7 +110,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/...rer/snapshots/ProvisioningTemplate/user_data/Preseed_default_user_data.host4dhcp.snap.txt b/...rer/snapshots/ProvisioningTemplate/user_data/Preseed_default_user_data.host4dhcp.snap.txt
@@ -68,10 +68,7 @@ ssldir = \$vardir/ssl
 [agent]
 pluginsync      = true
 report          = true
-ca_server       = localhost
 certname        = snapshot-ipv4-dhcp-el7
-server          = localhost
-environment     = test
 
 EOF
 
@@ -83,7 +80,7 @@ puppet_unit=puppet
 # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
 export FACTER_is_installer=true
 # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+/usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 

diff --git a/...man/renderer/snapshots/ProvisioningTemplate/user_data/UserData_default.host4dhcp.snap.txt b/...man/renderer/snapshots/ProvisioningTemplate/user_data/UserData_default.host4dhcp.snap.txt
@@ -67,10 +67,7 @@ runcmd:
   [agent]
   pluginsync      = true
   report          = true
-  ca_server       = localhost
   certname        = snapshot-ipv4-dhcp-el7
-  server          = localhost
-  environment     = test
 
   EOF
 
@@ -82,7 +79,7 @@ runcmd:
   # export a custom fact called 'is_installer' to allow detection of the installer environment in Puppet modules
   export FACTER_is_installer=true
   # passing a non-existent tag like "no_such_tag" to the puppet agent only initializes the node
-  /usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag --server localhost --no-daemonize
+  /usr/bin/puppet agent --config /etc/puppet/puppet.conf --onetime --tags no_such_tag  --no-daemonize
 
 
 phone_home: