(PE-31118) add MacOS 11 support #560
Conversation
puppet_agent::osfamily::darwin is a classthat may have no external impact to Forge modules. This module is declared in 3 of 576 indexed public
|
ciprianbadescu
force-pushed
the
PE-31118/add-osx11-support
branch
2 times, most recently
from
b38dbbd to
6c63c98
Compare
ciprianbadescu
changed the title
There was a problem hiding this comment.
Looks good!
Tested on a fresh node:
- installed latest nightly agent with the bolt task
- configured the module on PE and connected the agent
- managed agent version from PE using the PA module.
The commit check is failing because it accepts only MODULES as a project and we used to have a MODULES ticket for this.
ciprianbadescu
force-pushed
the
PE-31118/add-osx11-support
branch
from
6c63c98 to
178172b
Compare
Most of the changes are caused by the change in major product version. Until now, the major product version was 10.15, 10.14, etc. Starting with MacOS 11, the major version was incremented and we started to use only the first number (eg. 11) as major version
ciprianbadescu
force-pushed
the
PE-31118/add-osx11-support
branch
from
178172b to
77a7847
Compare
manifests/osfamily/darwin.pp
Outdated
| @@ -1,19 +1,25 @@ | |||
| class puppet_agent::osfamily::darwin{ | |||
| assert_private() | |||
|
|
|||
| if $::macosx_productversion_major =~ /^11\./ { | |||
There was a problem hiding this comment.
Assuming Apple will bump the major version on every macOS release, can we reverse the logic?
| if $::macosx_productversion_major =~ /^11\./ { | |
| if $::macosx_productversion_major =~ /^10\./ { |
Also, macosx_productversion_major will be just 11 because of puppetlabs/facter#2365. Since facter 3 doesn't have this change, maybe we can check based on macosx_productversion which should have the full version string everytime. Anyway if we reverse the logic it should be fine.
tasks/install_shell.sh
Outdated
| @@ -210,12 +210,17 @@ if [ -f "$PT__installdir/facts/tasks/bash.sh" ]; then | |||
| platform_version=`sw_vers | awk '/^ProductVersion:/ { print $2 }'` | |||
|
|
|||
| major_version=`echo $platform_version | cut -d. -f1,2` | |||
|
|
|||
| # Starting with MacOS 11, the major version is the first number only | |||
| if echo "${major_version}" | grep -q '^11\.'; then major_version=11; fi | |||
|
This is going to be a random question, but where do I find big sur packages for puppet? If I check https://downloads.puppet.com/mac/puppet7/ https://downloads.puppet.com/mac/puppet6/ which are the urls you're pointing in your module, I can find only 10.15 dmgs. |
|
Hi @Pigueiras, macOS 11 support is set to go out in the next puppet-agent releases. In the meantime you can find nightly builds here: http://nightlies.puppet.com/downloads/mac/. |
Most of the changes are caused by the change in major product version.
Until now, the major product version was 10.15, 10.14, etc.
Starting with MacOS 11, the major version was incremented and we
started to use only the first number (eg. 11) as major version