Uploaded image for project: 'Puppet Server'
  1. Puppet Server
  2. SERVER-1247

Packaging changes to support bootstrap.cfg improvements in TK and EZBake

    Details

    • Type: New Feature
    • Status: Closed
    • Priority: Normal
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: SERVER 2.5.0
    • Component/s: None
    • Labels:
      None
    • Template:
    • Sub-team:
    • Story Points:
      2
    • Sprint:
      Server Emerald 2016-05-04, Server Emerald 2016-05-18, Server Emerald 2016-06-01
    • Release Notes:
      Bug Fix
    • Release Notes Summary:
      Hide
      Joe will be adding some notes on this to the docs in the repo; we created SERVER-1470 to capture the write-up.
      Show
      Joe will be adding some notes on this to the docs in the repo; we created SERVER-1470 to capture the write-up.

      Description

      As a result of TK-347 and EZ-72, we will have the ability to separate out Puppet Server's bootstrap configuration into two files. One will ideally go somewhere under /opt, and will have all of the core services that we're confident that users won't need to change. The second would be a ca.cfg file that goes under a new services.d directory in the /etc directory, and will just contain the default configuration for the ca services.

      Work included in this ticket:
      1. Modify our packaging to put the new "main" bootstrap.cfg file in the appropriate place under /opt
      2. Modify our packaging to put the new "ca.cfg" file in the appropriate place under services.d.
      3. Modify our ezbake config to take advantage of whatever we need to from EZ-72, in order to set up our service scripts to use the correct argument for bootstrap-config.

      It is possible that 1 and/or 2 above may require some additional changes in EZBake? I'll create a separate ticket for that.

        Activity

        Hide
        chris Chris Price added a comment -

        Working on testing this now.

        Show
        chris Chris Price added a comment - Working on testing this now.
        Hide
        chris Chris Price added a comment -

        put up a PR that should hopefully fix this, but haven't had time to test it yet.

        Show
        chris Chris Price added a comment - put up a PR that should hopefully fix this, but haven't had time to test it yet.
        Hide
        chris Chris Price added a comment -

        The "defaults" files after the recent ezbake / services.d changes have a line like this:

        # Bootstrap path
        BOOTSTRAP_CONFIG="/etc/puppetlabs/puppetserver/services.d/,${INSTALL_DIR}/config/services.d/"
        

        Note that the first entry in the bootstrap config path is not attempting to use interpolation, but the second one is. Past Haus says that on systemd, there is no interpolation allowed in the defaults files. This should be a relatively straightforward change, to just switch the INSTALL_DIR bit to do the same thing that the first entry in the path is doing, so that the interpolation isn't necessary.

        Show
        chris Chris Price added a comment - The "defaults" files after the recent ezbake / services.d changes have a line like this: # Bootstrap path BOOTSTRAP_CONFIG="/etc/puppetlabs/puppetserver/services.d/,${INSTALL_DIR}/config/services.d/" Note that the first entry in the bootstrap config path is not attempting to use interpolation, but the second one is. Past Haus says that on systemd, there is no interpolation allowed in the defaults files. This should be a relatively straightforward change, to just switch the INSTALL_DIR bit to do the same thing that the first entry in the path is doing, so that the interpolation isn't necessary.
        Hide
        chris Chris Price added a comment -

        Moved this back to 'doing', as there is a bug on systemd. On the Jenkins runs here, we got failures on rhel7 and ubuntu 1604.

        They look like this:

        May 19 13:04:13 s4bkxxvgs9oggf5 java[2703]: Exception in thread "main" java.lang.IllegalArgumentException: Specified bootstrap config file does not exist: '${INSTALL_DIR}/config/services.d/'
        May 19 13:04:13 s4bkxxvgs9oggf5 java[2703]: at puppetlabs.trapperkeeper.bootstrap$eval14658$wrap_uri_error__14663$fn__14664.invoke(bootstrap.clj:131)
        May 19 13:04:13 s4bkxxvgs9oggf5 java[2703]: at puppetlabs.trapperkeeper.bootstrap$eval14658$wrap_uri_error__14663.invoke(bootstrap.clj:127)
        May 19 13:04:13 s4bkxxvgs9oggf5 java[2703]: at puppetlabs.trapperkeeper.bootstrap$eval14681$read_config__14686$fn__14687.invoke(bootstrap.clj:147)
        May 19 13:04:13 s4bkxxvgs9oggf5 java[2703]: at puppetlabs.trapperkeeper.bootstrap$eval14681$read_config__14686.invoke(bootstrap.clj:134)
        

        Show
        chris Chris Price added a comment - Moved this back to 'doing', as there is a bug on systemd. On the Jenkins runs here , we got failures on rhel7 and ubuntu 1604. They look like this: May 19 13:04:13 s4bkxxvgs9oggf5 java[2703]: Exception in thread "main" java.lang.IllegalArgumentException: Specified bootstrap config file does not exist: '${INSTALL_DIR}/config/services.d/' May 19 13:04:13 s4bkxxvgs9oggf5 java[2703]: at puppetlabs.trapperkeeper.bootstrap$eval14658$wrap_uri_error__14663$fn__14664.invoke(bootstrap.clj:131) May 19 13:04:13 s4bkxxvgs9oggf5 java[2703]: at puppetlabs.trapperkeeper.bootstrap$eval14658$wrap_uri_error__14663.invoke(bootstrap.clj:127) May 19 13:04:13 s4bkxxvgs9oggf5 java[2703]: at puppetlabs.trapperkeeper.bootstrap$eval14681$read_config__14686$fn__14687.invoke(bootstrap.clj:147) May 19 13:04:13 s4bkxxvgs9oggf5 java[2703]: at puppetlabs.trapperkeeper.bootstrap$eval14681$read_config__14686.invoke(bootstrap.clj:134)
        Hide
        karen Karen Van der Veer added a comment -

        Just waiting to make sure CI is green, otherwise this is unblocked because we merged yesterday.

        Show
        karen Karen Van der Veer added a comment - Just waiting to make sure CI is green, otherwise this is unblocked because we merged yesterday.
        Hide
        ruth Ruth Linehan added a comment -

        Karen Van der Veer We're waiting to merge down master -> stable, which I'm hoping to get done this afternoon (want to get a few more open PRs on master merged first).

        Show
        ruth Ruth Linehan added a comment - Karen Van der Veer We're waiting to merge down master -> stable, which I'm hoping to get done this afternoon (want to get a few more open PRs on master merged first).
        Hide
        karen Karen Van der Veer added a comment -

        Ruth LinehanJoe PinsonaultChris Price We were waiting on a # of things to happen for this one to move forward, refresh my memory?

        Show
        karen Karen Van der Veer added a comment - Ruth Linehan Joe Pinsonault Chris Price We were waiting on a # of things to happen for this one to move forward, refresh my memory?

          People

          • Assignee:
            erik Erik Dasher
            Reporter:
            chris Chris Price
          • Votes:
            0 Vote for this issue
            Watchers:
            5 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Agile