[the last part of] initial el8 / almalinux support

hieradata/cluster/auxtel-ccs.yaml

@@ -145,8 +145,6 @@ ccs_software::udp_properties:
 ccs_sal::ospl_home: "/opt/OpenSpliceDDS/V6.10.4/HDE/x86_64.linux"
 ccs_sal::rpms:
   ts_sal_utils: "ts_sal_utils-7.0.0-1.x86_64.rpm"
-ccs_sal::rpms_private:
-  OpenSpliceDDS: "OpenSpliceDDS-6.10.4-6.el7.x86_64.rpm"
 
 daq::daqsdk::purge: false
 

hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/7.yaml

@@ -0,0 +1,3 @@
+---
+ccs_sal::rpms_private:
+  OpenSpliceDDS: "OpenSpliceDDS-6.10.4-6.el7.x86_64.rpm"

hieradata/cluster/comcam-ccs.yaml

@@ -61,8 +61,6 @@ ccs_database::database: "comcamdbprod"
 ccs_sal::ospl_home: "/opt/OpenSpliceDDS/V6.10.4/HDE/x86_64.linux"
 ccs_sal::rpms:
   ts_sal_utils: "ts_sal_utils-7.0.0-1.x86_64.rpm"
-ccs_sal::rpms_private:
-  OpenSpliceDDS: "OpenSpliceDDS-6.10.4-6.el7.x86_64.rpm"
 
 ## Used in lookups:
 ccs_site: "summit"

hieradata/cluster/comcam-ccs/osfamily/RedHat/major/7.yaml

@@ -0,0 +1,3 @@
+---
+ccs_sal::rpms_private:
+  OpenSpliceDDS: "OpenSpliceDDS-6.10.4-6.el7.x86_64.rpm"

hieradata/role/foreman.yaml

@@ -147,14 +147,6 @@ foreman::unattended: true
 foreman::user: "foreman"
 foreman::user_groups: ["puppet"]
 foreman::version: "3.2.1"
-postgresql::globals::bindir: "/usr/bin"
-postgresql::globals::client_package_name: "rh-postgresql12-syspaths"
-postgresql::globals::confdir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
-postgresql::globals::contrib_package_name: "rh-postgresql12-postgresql-contrib-syspaths"
-postgresql::globals::datadir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
-postgresql::globals::server_package_name: "rh-postgresql12-postgresql-server-syspaths"
-postgresql::globals::service_name: "postgresql"
-postgresql::globals::version: "12"
 postgresql::server::config_entries:
   max_connections: 1000
   shared_buffers: "2GB"
@@ -187,60 +179,6 @@ puppet::server::puppetserver_profiler: false  # disabled for performance
 puppet::server_version: *server_version  # XXX does this do anything?
 puppet::version: "%{lookup('puppet_agent::package_version')}"  # agent version
 puppetdb::globals::version: "7.11.0"
-profile::core::yum::versionlock:
-  puppetserver:
-    ensure: "present"
-    version: "7.9.0"
-    release: "1.el7"
-    before: "Package[puppetserver]"
-  puppetdb-termini:
-    ensure: "present"
-    version: "7.11.0"
-    release: "1.el7"
-    before: "Package[puppetdb-termini]"
-  foreman:
-    ensure: "present"
-    version: "%{lookup('foreman::version')}"
-    release: "1.el7"
-  foreman-libvirt:
-    ensure: "present"
-    version: "%{lookup('foreman::version')}"
-    release: "1.el7"
-  foreman-dynflow-sidekiq:
-    ensure: "present"
-    version: "%{lookup('foreman::version')}"
-    release: "1.el7"
-  foreman-service:
-    ensure: "present"
-    version: "%{lookup('foreman::version')}"
-    release: "1.el7"
-  foreman-postgresql:
-    ensure: "present"
-    version: "%{lookup('foreman::version')}"
-    release: "1.el7"
-  foreman-debug:
-    ensure: "present"
-    version: "%{lookup('foreman::version')}"
-    release: "1.el7"
-  foreman-cli:
-    ensure: "present"
-    version: "%{lookup('foreman::version')}"
-    release: "1.el7"
-  foreman-installer:
-    ensure: "present"
-    epoch: 1
-    version: "%{lookup('foreman::version')}"
-    release: "2.el7"
-  foreman-proxy:
-    ensure: "present"
-    version: "%{lookup('foreman::version')}"
-    release: "1.el7"
-  foreman-vmware:
-    ensure: "present"
-    version: "%{lookup('foreman::version')}"
-    release: "1.el7"
-
-redis::globals::scl: "rh-redis5"
 
 ssh::client_options:
   "ProxyCommand": "--"

hieradata/role/foreman/osfamily/RedHat/major/7.yaml

@@ -0,0 +1,62 @@
+---
+postgresql::globals::bindir: "/usr/bin"
+postgresql::globals::client_package_name: "rh-postgresql12-syspaths"
+postgresql::globals::confdir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
+postgresql::globals::contrib_package_name: "rh-postgresql12-postgresql-contrib-syspaths"
+postgresql::globals::datadir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
+postgresql::globals::server_package_name: "rh-postgresql12-postgresql-server-syspaths"
+postgresql::globals::service_name: "postgresql"
+postgresql::globals::version: "12"
+profile::core::yum::versionlock:
+  puppetserver:
+    ensure: "present"
+    version: "7.9.0"
+    release: "1.el7"
+    before: "Package[puppetserver]"
+  puppetdb-termini:
+    ensure: "present"
+    version: "7.11.0"
+    release: "1.el7"
+    before: "Package[puppetdb-termini]"
+  foreman:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el7"
+  foreman-libvirt:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el7"
+  foreman-dynflow-sidekiq:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el7"
+  foreman-service:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el7"
+  foreman-postgresql:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el7"
+  foreman-debug:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el7"
+  foreman-cli:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el7"
+  foreman-installer:
+    ensure: "present"
+    epoch: 1
+    version: "%{lookup('foreman::version')}"
+    release: "2.el7"
+  foreman-proxy:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el7"
+  foreman-vmware:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el7"
+redis::globals::scl: "rh-redis5"

hieradata/role/foreman/osfamily/RedHat/major/8.yaml

@@ -0,0 +1,53 @@
+---
+profile::core::yum::versionlock:
+  puppetserver:
+    ensure: "present"
+    version: "7.9.0"
+    release: "1.el8"
+    before: "Package[puppetserver]"
+  puppetdb-termini:
+    ensure: "present"
+    version: "7.11.0"
+    release: "1.el8"
+    before: "Package[puppetdb-termini]"
+  foreman:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el8"
+  foreman-libvirt:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el8"
+  foreman-dynflow-sidekiq:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el8"
+  foreman-service:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el8"
+  foreman-postgresql:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el8"
+  foreman-debug:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el8"
+  foreman-cli:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el8"
+  foreman-installer:
+    ensure: "present"
+    epoch: 1
+    version: "%{lookup('foreman::version')}"
+    release: "2.el8"
+  foreman-proxy:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el8"
+  foreman-vmware:
+    ensure: "present"
+    version: "%{lookup('foreman::version')}"
+    release: "1.el8"

hieradata/role/ipareplica.yaml

@@ -35,24 +35,4 @@ clustershell::groupmembers:
       - "ipa[1-3].tu.lsst.org"
       - "ipa1.dev.lsst.org"
 
-profile::core::yum::versionlock:
-  python2-ipaserver: &ipa_version
-    ensure: "present"
-    version: "4.6.8"
-    release: "5.el7.centos.7"
-  ipa-client-common:
-    <<: *ipa_version
-  python2-ipaclient:
-    <<: *ipa_version
-  ipa-server-common:
-    <<: *ipa_version
-  ipa-common:
-    <<: *ipa_version
-  python2-ipalib:
-    <<: *ipa_version
-  ipa-client:
-    <<: *ipa_version
-  ipa-server:
-    <<: *ipa_version
-
 profile::core::ipa_pwd_reset::ldap_user: "ldap-passwd-reset"

hieradata/role/ipareplica/osfamily/RedHat/major/7.yaml

@@ -0,0 +1,20 @@
+---
+profile::core::yum::versionlock:
+  python2-ipaserver: &ipa_version
+    ensure: "present"
+    version: "4.6.8"
+    release: "5.el7.centos.7"
+  ipa-client-common:
+    <<: *ipa_version
+  python2-ipaclient:
+    <<: *ipa_version
+  ipa-server-common:
+    <<: *ipa_version
+  ipa-common:
+    <<: *ipa_version
+  python2-ipalib:
+    <<: *ipa_version
+  ipa-client:
+    <<: *ipa_version
+  ipa-server:
+    <<: *ipa_version

hieradata/role/ipareplica/osfamily/RedHat/major/8.yaml

@@ -0,0 +1,20 @@
+---
+profile::core::yum::versionlock:
+  python2-ipaserver: &ipa_version
+    ensure: "present"
+    version: "4.6.8"
+    release: "5.el8.centos.7"
+  ipa-client-common:
+    <<: *ipa_version
+  python2-ipaclient:
+    <<: *ipa_version
+  ipa-server-common:
+    <<: *ipa_version
+  ipa-common:
+    <<: *ipa_version
+  python2-ipalib:
+    <<: *ipa_version
+  ipa-client:
+    <<: *ipa_version
+  ipa-server:
+    <<: *ipa_version

hieradata/role/perfsonar.yaml

@@ -70,9 +70,3 @@ perfsonar::pscheduler_agent_config:
 perfsonar::manage_lsregistrationdaemon: true
 perfsonar::lsregistrationdaemon_ensure: "stopped"
 perfsonar::lsregistrationdaemon_enable: false
-profile::core::yum::versionlock:
-  # XXX do we need to versionlock all of the sub-packages as well?
-  perfsonar-toolkit:
-    ensure: "present"
-    version: "4.4.0"
-    release: "1.el7"

hieradata/role/perfsonar/osfamily/RedHat/major/7.yaml

@@ -0,0 +1,7 @@
+---
+profile::core::yum::versionlock:
+  # XXX do we need to versionlock all of the sub-packages as well?
+  perfsonar-toolkit:
+    ensure: "present"
+    version: "4.4.0"
+    release: "1.el7"

hieradata/role/perfsonar/osfamily/RedHat/major/8.yaml

@@ -0,0 +1,7 @@
+---
+profile::core::yum::versionlock:
+  # XXX do we need to versionlock all of the sub-packages as well?
+  perfsonar-toolkit:
+    ensure: "present"
+    version: "4.4.0"
+    release: "1.el8"

hieradata/role/puppetdb.yaml

@@ -3,23 +3,6 @@ classes:
   - "profile::core::common"
   - "profile::core::puppetdb"
 
-packages:
-  - "rh-postgresql12-syspaths"
-postgresql::client::package_name: "rh-postgresql12-syspaths"  # appears to be ignored
-# puppetdb::globals is declared by puppetdb::database::postgresql
-postgresql::globals::bindir: "/usr/bin"
-postgresql::globals::client_package_name: "rh-postgresql12-syspaths"  # appears to be ignored
-postgresql::globals::confdir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
-postgresql::globals::contrib_package_name: "rh-postgresql12-postgresql-contrib-syspaths"
-postgresql::globals::datadir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
-postgresql::globals::server_package_name: "rh-postgresql12-postgresql-server-syspaths"
-postgresql::globals::service_name: "postgresql"
-postgresql::globals::version: "12"
-profile::core::yum::versionlock:
-  puppetdb:
-    ensure: "present"
-    version: "%{lookup('puppetdb::globals::version')}"
-    release: "1.el7"
 puppetdb::database_listen_address: "localhost"
 puppetdb::globals::version: "7.11.0"
 puppetdb::java_args:

hieradata/role/puppetdb/osfamily/RedHat/major/7.yaml

@@ -0,0 +1,18 @@
+---
+packages:
+  - "rh-postgresql12-syspaths"
+postgresql::client::package_name: "rh-postgresql12-syspaths"  # appears to be ignored
+# puppetdb::globals is declared by puppetdb::database::postgresql
+postgresql::globals::bindir: "/usr/bin"
+postgresql::globals::client_package_name: "rh-postgresql12-syspaths"  # appears to be ignored
+postgresql::globals::confdir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
+postgresql::globals::contrib_package_name: "rh-postgresql12-postgresql-contrib-syspaths"
+postgresql::globals::datadir: "/var/opt/rh/rh-postgresql12/lib/pgsql/data"
+postgresql::globals::server_package_name: "rh-postgresql12-postgresql-server-syspaths"
+postgresql::globals::service_name: "postgresql"
+postgresql::globals::version: "12"
+profile::core::yum::versionlock:
+  puppetdb:
+    ensure: "present"
+    version: "%{lookup('puppetdb::globals::version')}"
+    release: "1.el7"

hieradata/role/puppetdb/osfamily/RedHat/major/8.yaml

@@ -0,0 +1,6 @@
+---
+profile::core::yum::versionlock:
+  puppetdb:
+    ensure: "present"
+    version: "%{lookup('puppetdb::globals::version')}"
+    release: "1.el8"

spec/hosts/roles/ipareplica_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 IPA_SERVER_VERSION = '4.6.8'
-IPA_SERVER_RELEASE = '5.el7.centos.7'
+IPA_SERVER_RELEASE = '5.EL.centos.7'
 
 role = 'ipareplica'
 
@@ -42,9 +42,11 @@
             ipa-server
           ].each do |pkg|
             it do
+              el_release = "el#{facts[:os]['release']['major']}"
+
               is_expected.to contain_yum__versionlock(pkg).with(
                 version: IPA_SERVER_VERSION,
-                release: IPA_SERVER_RELEASE,
+                release: IPA_SERVER_RELEASE.gsub('EL', el_release),
               )
             end
           end