(PUP-10670) Create serverport setting and alias

[GabrielNagy]

This commit creates a serverport setting which serves the same
functionality as masterport. Update the puppet code itself to use the
new setting, and add a hook to the old one to always set the new one as
well.

TBD: are we deprecating the masterport setting?

[ciprianbadescu]

The behavior does not look right:

cbadescu@ciprian:~/puppetlabs/puppet$ bx puppet config print masterport
Warning: Setting 'masterport' is being deprecated in favor of 'serverport'.
   (location: /home/cbadescu/puppetlabs/puppet/lib/puppet/defaults.rb:1368:in `block in initialize_default_settings!')
9876
cbadescu@ciprian:~/puppetlabs/puppet$ bx puppet config print serverport
Warning: Setting 'masterport' is being deprecated in favor of 'serverport'.
   (location: /home/cbadescu/puppetlabs/puppet/lib/puppet/defaults.rb:1368:in `block in initialize_default_settings!')
9876

[puppetcla]

CLA signed by all contributors.

[GabrielNagy]

@ciprianbadescu I removed that warning, it's kinda noisy as it shows up for any setting you query if you have the masterport set somewhere.

We have some more masterport references in the ext/ directory. I left them as is, but something tells me these aren't used anymore:

ext/suse/server.init
45:[ -n "$PUPPETMASTER_PORTS" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"

ext/redhat/server.init
27:[ -n "$PUPPETMASTER_PORTS" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"

ext/debian/puppetmaster.init
53:            --startas $DAEMON -- $NAME $DAEMON_OPTS --masterport=$PORT

[GabrielNagy]

jenkins please test this with servertests

[ciprianbadescu]

We have some more masterport references in the ext/ directory. I left them as is, but something tells me these aren't used anymore:

ext/suse/server.init
45:[ -n "$PUPPETMASTER_PORTS" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"

ext/redhat/server.init
27:[ -n "$PUPPETMASTER_PORTS" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"

ext/debian/puppetmaster.init
53:            --startas $DAEMON -- $NAME $DAEMON_OPTS --masterport=$PORT

I think they can be set from places like /etc/sysconfig/puppet, I suppose they should be adapted
But I don't k now if we package those files or similar files from puppet-agent repo

[joshcooper]

TBD: are we deprecating the masterport setting?

I think we shouldn't deprecate it (or other things like puppet config set external_nodes <...> --section master) because of the noise factor. At some point in the future we can deprecate (probably 7.x) and remove in 8.

ext/suse/server.init, ext/debian/puppetmaster.init

I believe those scripts are left over from the ruby puppet master (webrick & passenger) and can be removed. I'd be fine filing a separate ticket to clean up that directory.

[joshcooper]

jenkins please test this with servertests

[GabrielNagy]

Filed PUP-10685 for cleaning up the ext/ directory.