Start porting installer to Puppet 7

Puppetfile should be good to go now. Functionality has not been tested.

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>

Author: mattock

Puppetfile

@@ -3,57 +3,82 @@
 
 forge 'https://forgeapi.puppetlabs.com'
 
-mod 'puppetlabs-apt', '7.3.0'
-mod 'puppetlabs-apache', '5.4.0'
-mod 'puppetlabs-augeas_core', '1.0.5'
-mod 'puppetlabs-concat', '6.2.0'
-mod 'puppetlabs-cron_core', '1.0.3'
-mod 'stm-debconf', '3.0.0'
-mod 'theforeman/dhcp', '5.1.1'
-mod 'theforeman/dns', '7.0.0'
-mod 'ghoneycutt-dnsclient', '3.6.0'
-mod 'puppet-epel', '3.0.1'
-mod 'puppetlabs-firewall', '2.2.0'
-mod 'theforeman/foreman', '14.0.0'
-mod 'theforeman/foreman_proxy', '13.0.0'
-mod 'theforeman/git', '6.0.2'
+mod 'puppetlabs-apt', '8.0.1'
+mod 'puppetlabs-apache', '6.0.0'
+mod 'puppetlabs-augeas_core', '1.1.2'
+mod 'puppetlabs-concat', '7.0.0'
+mod 'puppetlabs-cron_core',
+  :git => 'https://github.com/puppetlabs/puppetlabs-cron_core.git',
+  :ref => 'c63ef326bfd2cdd96bbfc3aa368358e301dd7b66'
+mod 'stm-debconf', '3.3.1'
+mod 'ghoneycutt-dnsclient',
+  :git => 'https://github.com/Puppet-Finland/puppet-module-dnsclient.git',
+  :ref => 'puppet7'
+mod 'puppet-epel',
+  :git => 'https://github.com/Puppet-Finland/puppet-module-epel.git',
+  :ref => 'puppet7'
+mod 'puppetlabs-firewall', '3.0.0'
+mod 'theforeman/git',
+  :git => 'https://github.com/Puppet-Finland/puppet-git.git',
+  :ref => 'puppet7'
 mod 'chrekh-hosts', '2.3.1'
-mod 'puppetlabs-inifile', '4.1.0'
+mod 'puppetlabs-inifile', '5.0.0'
 mod 'saz-locales',
-    :git => 'https://github.com/saz/puppet-locales.git',
-    :ref => '2d8c5a9efa6cc9bf80823b7161aec07d31a8c5b0'
-mod 'puppet-make', '3.0.0'
-mod 'saz-memcached', '3.4.0'
-mod 'puppetlabs/mysql', '10.3.0'
-mod 'puppetlabs-ntp', '8.2.0'
+  :git => 'https://github.com/Puppet-Finland/puppet-locales-1.git',
+  :ref => 'puppet7'
+mod 'puppet-make',
+  :git => 'https://github.com/Puppet-Finland/puppet-make.git',
+  :ref => 'puppet7'
+mod 'puppetlabs/mysql', '11.0.0'
+mod 'puppetlabs-ntp', '9.0.0'
 mod 'puppetfinland-packetfilter', '2.0.3'
-mod 'puppetlabs/postgresql', '6.3.0'
-mod 'theforeman/puppet', '14.2.1'
-mod 'puppetlabs-puppet_authorization', '0.5.0'
+mod 'puppetlabs/postgresql', '7.0.2'
+mod 'theforeman/puppet',
+  :git => 'https://github.com/Puppet-Finland/puppet-puppet.git',
+  :ref => 'puppet-7'
+mod 'puppetlabs-puppet_authorization',
+  :git => 'https://github.com/Puppet-Finland/puppetlabs-puppet_authorization.git',
+  :ref => 'puppet7'
 mod 'puppet-puppetboard',
   :git => 'https://github.com/Puppet-Finland/puppet-module-puppetboard.git',
-  :ref => 'd716c55022e54046002666f7c63df39a14daffce'
+  :ref => 'latest_python_module'
 mod 'puppetlabs/puppetdb', '7.7.1'
-mod 'puppetlabs-puppetserver_gem', '1.1.1'
+mod 'puppetlabs-puppetserver_gem',
+  :git => 'https://github.com/Puppet-Finland/puppetlabs-puppetserver_gem.git',
+  :ref => 'puppet7'
 mod 'puppet-python',
-  :git => 'https://github.com/voxpupuli/puppet-python.git',
-  :ref => 'd7be32bcd801feaae2e490972c4c1237119be90a'
-mod 'puppet-r10k', '8.0.0'
-mod 'puppetlabs-reboot', '2.4.0'
+  :git => 'https://github.com/Puppet-Finland/puppet-python.git',
+  :ref => 'puppet7'
+mod 'puppet-r10k',
+  :git => 'https://github.com/voxpupuli/puppet-r10k.git',
+  :ref => '451326074757cd7adbae82c0b262cfc4b5bc87b9'
+mod 'puppetlabs-reboot', '4.0.2'
 mod 'puppetlabs-ruby',
   :git => 'https://github.com/Puppet-Finland/puppetlabs-ruby.git',
-  :ref => 'puppet6'
-mod 'puppet-selinux', '3.1.0'
-mod 'puppetlabs-selinux_core', '1.0.4'
-mod 'puppetlabs-stdlib', '6.2.0'
-mod 'puppetlabs-sshkeys_core', '1.0.3'
-mod 'camptocamp-systemd', '2.12.0'
-mod 'theforeman/tftp', '5.0.2'
-mod 'saz-timezone', '6.1.0'
-mod 'puppetlabs-vcsrepo', '3.1.0'
-mod 'puppetlabs-yumrepo_core', '1.0.7'
-mod 'puppet-redis', '5.0.0'
-mod 'puppet-extlib', '5.0.0'
+  :ref => 'puppet7'
+mod 'puppet-selinux',
+  :git => 'https://github.com/Puppet-Finland/puppet-selinux.git',
+  :ref => 'puppet7'
+mod 'puppetlabs-selinux_core',
+  :git => 'https://github.com/puppetlabs/puppetlabs-selinux_core.git',
+  :ref => '47e11e255a2f7db3589d7bb5265edc92adafb684'
+mod 'puppetlabs-stdlib', '7.0.0'
+mod 'puppetlabs-sshkeys_core',
+  :git => 'https://github.com/puppetlabs/puppetlabs-sshkeys_core.git',
+  :ref => '45850cc69103259925d7f4f829b57b95dd173b89'
+mod 'camptocamp-systemd',
+  :git => 'https://github.com/camptocamp/puppet-systemd.git',
+  :ref => '319bb69f19b18c40bcc981a493a7b5807ce6ce37'
+mod 'saz-timezone',
+  :git => 'https://github.com/Puppet-Finland/puppet-timezone.git',
+  :ref => 'puppet7'
+mod 'puppetlabs-vcsrepo', '4.0.1'
+mod 'puppetlabs-yumrepo_core',
+  :git => 'https://github.com/puppetlabs/puppetlabs-yumrepo_core.git',
+  :ref => '53050ed824ac0a7e266bef78d6606a04dad3f070'
+mod 'puppet-extlib',
+  :git => 'https://github.com/Puppet-Finland/puppet-extlib.git',
+  :ref => 'puppet7'
 mod 'richardc-datacat', '0.6.2'
 
 

metadata.json

@@ -136,7 +136,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.0.0 < 7.0.0"
+      "version_requirement": ">= 5.0.0 < 8.0.0"
     }
   ],
   "pdk-version": "1.18.1",

vagrant/prepare.sh

@@ -77,7 +77,7 @@ setup_puppet() {
         true
     else
         if [ $RHEL_VERSION ]; then
-            RELEASE_URL="https://yum.puppet.com/puppet6-release-el-${RHEL_VERSION}.noarch.rpm"
+            RELEASE_URL="https://yum.puppet.com/puppet7-release-el-${RHEL_VERSION}.noarch.rpm"
             rpm -hiv "${RELEASE_URL}" || (c=$?; echo "Failed to install ${RELEASE_URL}"; (exit $c))
             yum -y install puppet-agent || (c=$?; echo "Failed to install puppet agent"; (exit $c))
             if systemctl list-unit-files --type=service | grep firewalld; then
@@ -87,10 +87,10 @@ setup_puppet() {
             fi
         else
             if [ $UBUNTU_VERSION ]; then
-                APT_URL="https://apt.puppet.com/puppet6-release-${UBUNTU_VERSION}.deb"
+                APT_URL="https://apt.puppet.com/puppet7-release-${UBUNTU_VERSION}.deb"
             fi
             if [ $DEBIAN_VERSION ]; then
-                APT_URL="https://apt.puppet.com/puppet6-release-${DEBIAN_VERSION}.deb"
+                APT_URL="https://apt.puppet.com/puppet7-release-${DEBIAN_VERSION}.deb"
             fi
             # https://serverfault.com/questions/500764/dpkg-reconfigure-unable-to-re-open-stdin-no-file-or-directory
             export DEBIAN_FRONTEND=noninteractive