(MODULES-8523) Remove legacy Puppet 3 code #374
Conversation
ekinanp
force-pushed
the
MODULES-8523
branch
2 times, most recently
from
06c6d61
to
56e40f5
Compare
|
CLA signed by all contributors. |
ekinanp
force-pushed
the
MODULES-8523
branch
3 times, most recently
from
01cb391
to
f9e0166
Compare
manifests/init.pp
Outdated
| fail("invalid version ${package_version} requested") | ||
| } | ||
|
|
||
| # Strip git sha from dev builds | ||
| if ($package_version != undef and $package_version =~ /g/){ | ||
| if $package_version =~ /g/ { | ||
| $_expected_package_version = split($package_version, /[.-]g.*/)[0] | ||
| } else { | ||
| $_expected_package_version = $package_version | ||
| } | ||
|
|
||
| $aio_upgrade_required = (getvar('::aio_agent_version') == undef) or |
There was a problem hiding this comment.
I wonder if I can remove the (getvar('::aio_agent_version') == undef) check? That fact should be defined on Puppet 4 agents, shouldn't it?
There was a problem hiding this comment.
It should blow up a few lines further down if it's missing.
There was a problem hiding this comment.
Turns out I can remove it -- checking if it is undef is a quick way to see if you're running on a pre-Puppet 4 node. Updated the PR with the removal.
|
I've tested some PE upgrades on: and things seem to work fine. This is ready for merge. EDIT: Not yet, there's a few classes that can be removed here too. |
ekinanp
force-pushed
the
MODULES-8523
branch
3 times, most recently
from
a3704d9
to
1d697bb
Compare
| @@ -73,28 +67,27 @@ | |||
| validate_absolute_path($install_dir) | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
I wonder if it'd be worth adding a check here to error if $::aio_agent_version is undefined (i.e. error if we're running on a pre-Puppet 4 node, assuming my Q. about $::aio_agent_version is true).
There was a problem hiding this comment.
My Q. about $::aio_agent_version is true, so my other Q. about whether it's worth erroring if that variable is undefined still stands.
There was a problem hiding this comment.
I think so, yes. Major things depend on it being set.
There was a problem hiding this comment.
I'll push up another commit to add this capability then.
|
Ok, now this is ready for merge. |
|
It'd be good if somebody can double-check some of the logical substitutions made in this PR, as those can be subtle. |
The puppet_agent module no longer supports upgrades from Puppet 3 nodes. This commit removes the remaining Puppet 3 code from the main manifests and any remaining spec tests.
| @@ -105,7 +97,6 @@ | |||
| # use the full version string for comparisons. | |||
| if $::operatingsystem == 'Solaris' and $::operatingsystemmajrelease == '11' { | |||
| # Strip letters from development builds. Unique to Solaris 11 packaging. | |||
| # Need to pass the regex as strings for Puppet 3 compatibility. | |||
There was a problem hiding this comment.
So does it get us or lose us anything to keep passing as strings? Or is it a wash?
There was a problem hiding this comment.
It would be better to pass them in as patterns, but I don't want to risk accidentally breaking something due to some mal-formed regex (e.g. like escaping the wrong thing), so I chose to keep them in as strings.
| :lsbdistcodename => 'baz', | ||
| :mco_server_config => nil, | ||
| :mco_client_config => nil, | ||
| :lsbdistcodename => 'baz' |
There was a problem hiding this comment.
Nit: does this need a trailing comma?
README.markdown
Outdated
| * `puppet_agent::osfamily::*`: Platform-specific preparation performed before upgrades. | ||
| * `puppet_agent::prepare`: Prepares the agent for upgrade. | ||
| * `puppet_agent::prepare::package`: Stages packages locally for install, on platforms that can't install from remote packages. | ||
| * `puppet_agent::prepare::*`: Prepare various file and ssl configuration. | ||
| * `puppet_agent::prepare::*`: Prepare various file configuration. |
|
Pushed up another commit to error if the |
An undefined aio_agent_version fact means we're running on a pre-Puppet 4 node. Since pre-Puppet 4 upgrades are no longer supported, we should fail the run if aio_agent_version is undefined.
The puppet_agent module no longer supports upgrades from Puppet 3 nodes.
This commit removes the remaining Puppet 3 code from the manifest and
any remaining spec tests.