particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel86: enable auto-registration for azure

Browse source 
We want to ensure that cloud images connect to Red Hat[1] independently
of how the content was acquired (PAYG, BYOS, or marketplace).
This auto-registration feature is already enabled for AWS and this
patch enables it for Azure with the same recommended settings:

Services:
  rhsmcertd: Enabled (already done, so not changed in the patch)

/etc/rhsm/rhsm.conf:
  auto_registration: enabled
  auto_registration_interval: 60 (the default, so not explicitly set)
  manage_repos: false

The latter value `manage_repos` is left enabled (the default) in case
the user explicitly requested to have the system subscribed, i.e. the
`RHSMConfigWithSubscription` code path.

Regenerate the relevant test manifests and image information.

[1] https://cloud.redhat.com
[2] https://docs.google.com/document/d/1VeZFJxNUlyZMQJh6s3NA3RLvadqATsGxVet6uuP87_4
This commit is contained in:
Christian Kellner 2022-04-06 10:53:11 +02:00
parent ab98c66b9f
commit aaee939f9b
3 changed files with 49 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
internal/distro/rhel86/distro.go
View file

@ -977,6 +977,23 @@ func newDistro(distroName string) distro.Distro {
Enabled: false,
},
},
SubMan: &osbuild.RHSMStageOptionsSubMan{
Rhsmcertd: &osbuild.SubManConfigRHSMCERTDSection{
AutoRegistration: common.BoolToPtr(true),
},
Rhsm: &osbuild.SubManConfigRHSMSection{
ManageRepos: common.BoolToPtr(false),
},
},
},
distro.RHSMConfigWithSubscription: {
SubMan: &osbuild.RHSMStageOptionsSubMan{
Rhsmcertd: &osbuild.SubManConfigRHSMCERTDSection{
AutoRegistration: common.BoolToPtr(true),
},
// do not disable the redhat.repo management if the user
// explicitly request the system to be subscribed
},
},
},
Grub2Config: &osbuild.GRUB2Config{

15
test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json
View file

@ -1022,6 +1022,14 @@
"subscription-manager": {
"enabled": false
}
},
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
@ -13919,7 +13927,7 @@
"size": 67667738112,
"start": 1051721728,
"type": "E6D6D379-F507-44C2-A23C-238F2A3DF928",
"uuid": "zQYrlg-Thk5-WKd6-MXEx-ixaD-H5Kw-hom2gi"
"uuid": "xmOwdh-Ej3V-TzwH-CbpE-FKhh-azUG-13zwuf"
},
{
"bootable": false,
@ -14004,7 +14012,7 @@
"entitlementcertdir": "/etc/pki/entitlement",
"full_refresh_on_yum": "0",
"inotify": "1",
"manage_repos": "1",
"manage_repos": "0",
"package_profile_on_trans": "0",
"pluginconfdir": "/etc/rhsm/pluginconf.d",
"plugindir": "/usr/share/rhsm-plugins",
@ -14014,7 +14022,7 @@
"report_package_profile": "1"
},
"rhsmcertd": {
"auto_registration": "0",
"auto_registration": "1",
"auto_registration_interval": "60",
"autoattachinterval": "1440",
"certcheckinterval": "240",
@ -14047,6 +14055,7 @@
"/boot/efi/EFI/redhat/shimx64.efi": ".......T.",
"/etc/dnf/plugins/subscription-manager.conf": "S.5....T.",
"/etc/machine-id": ".M.......",
"/etc/rhsm/rhsm.conf": "..5....T.",
"/etc/security/pwquality.conf": "S.5....T.",
"/etc/ssh/sshd_config": "S.5....T.",
"/etc/waagent.conf": "..5....T.",

31
test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json
View file

@ -1026,6 +1026,14 @@
"subscription-manager": {
"enabled": false
}
},
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
@ -13202,7 +13210,7 @@
"bin:x:1:",
"cdrom:x:11:",
"chrony:x:986:",
"clevis:x:993:",
"clevis:x:994:",
"cockpit-ws:x:989:",
"cockpit-wsinstance:x:988:",
"daemon:x:2:",
@ -13222,14 +13230,14 @@
"man:x:15:",
"mem:x:8:",
"nobody:x:65534:",
"polkitd:x:996:",
"printadmin:x:994:",
"polkitd:x:992:",
"printadmin:x:995:",
"render:x:998:",
"rngd:x:985:",
"root:x:0:",
"setroubleshoot:x:990:",
"slocate:x:21:",
"ssh_keys:x:995:",
"ssh_keys:x:996:",
"sshd:x:74:",
"sssd:x:987:",
"sys:x:3:",
@ -13240,7 +13248,7 @@
"tcpdump:x:72:",
"tss:x:59:clevis",
"tty:x:5:",
"unbound:x:992:",
"unbound:x:993:",
"users:x:100:",
"utempter:x:35:",
"utmp:x:22:",
@ -13974,7 +13982,7 @@
"size": 67667738112,
"start": 1051721728,
"type": "E6D6D379-F507-44C2-A23C-238F2A3DF928",
"uuid": "krHFC4-dpMH-VJcx-sBIJ-ABet-kvRW-Q9hEJw"
"uuid": "7LXUU6-BGq7-Mkda-qdUC-GJ26-JCjM-bAeugo"
},
{
"bootable": false,
@ -14011,7 +14019,7 @@
"adm:x:3:4:adm:/var/adm:/sbin/nologin",
"bin:x:1:1:bin:/bin:/sbin/nologin",
"chrony:x:990:986::/var/lib/chrony:/sbin/nologin",
"clevis:x:997:993:Clevis Decryption Framework unprivileged user:/var/cache/clevis:/sbin/nologin",
"clevis:x:998:994:Clevis Decryption Framework unprivileged user:/var/cache/clevis:/sbin/nologin",
"cockpit-ws:x:993:989:User for cockpit web service:/nonexisting:/sbin/nologin",
"cockpit-wsinstance:x:992:988:User for cockpit-ws instances:/nonexisting:/sbin/nologin",
"daemon:x:2:2:daemon:/sbin:/sbin/nologin",
@ -14024,7 +14032,7 @@
"mail:x:8:12:mail:/var/spool/mail:/sbin/nologin",
"nobody:x:65534:65534:Kernel Overflow User:/:/sbin/nologin",
"operator:x:11:0:operator:/root:/sbin/nologin",
"polkitd:x:998:996:User for polkitd:/:/sbin/nologin",
"polkitd:x:996:992:User for polkitd:/:/sbin/nologin",
"rngd:x:989:985:Random Number Generator Daemon:/var/lib/rngd:/sbin/nologin",
"root:x:0:0:root:/root:/bin/bash",
"setroubleshoot:x:994:990::/var/lib/setroubleshoot:/sbin/nologin",
@ -14036,7 +14044,7 @@
"systemd-resolve:x:193:193:systemd Resolver:/:/sbin/nologin",
"tcpdump:x:72:72::/:/sbin/nologin",
"tss:x:59:59:Account used for TPM access:/dev/null:/sbin/nologin",
"unbound:x:996:992:Unbound DNS resolver:/etc/unbound:/sbin/nologin"
"unbound:x:997:993:Unbound DNS resolver:/etc/unbound:/sbin/nologin"
],
"rhsm": {
"dnf-plugins": {
@ -14059,7 +14067,7 @@
"entitlementcertdir": "/etc/pki/entitlement",
"full_refresh_on_yum": "0",
"inotify": "1",
"manage_repos": "1",
"manage_repos": "0",
"package_profile_on_trans": "0",
"pluginconfdir": "/etc/rhsm/pluginconf.d",
"plugindir": "/usr/share/rhsm-plugins",
@ -14069,7 +14077,7 @@
"report_package_profile": "1"
},
"rhsmcertd": {
"auto_registration": "0",
"auto_registration": "1",
"auto_registration_interval": "60",
"autoattachinterval": "1440",
"certcheckinterval": "240",
@ -14101,6 +14109,7 @@
"/boot/efi/EFI/redhat/shimx64.efi": ".......T.",
"/etc/dnf/plugins/subscription-manager.conf": "S.5....T.",
"/etc/machine-id": ".M.......",
"/etc/rhsm/rhsm.conf": "..5....T.",
"/etc/security/pwquality.conf": "S.5....T.",
"/etc/ssh/sshd_config": "S.5....T.",
"/etc/waagent.conf": "..5....T.",