Skip to content

Rebase on upstream 2.3.1 and switch from Puppet to OpenVox - #377

Closed
marc-makandra wants to merge 10 commits into
github:masterfrom
makandra:marc-makandra
Closed

marc-makandra wants to merge 10 commits into
github:masterfrom
makandra:marc-makandra

Conversation

@marc-makandra

Copy link
Copy Markdown

Upstream github/octocatalog-diff is unmaintained (#335, #347 unanswered), and the puppet gem doesn't work on Ruby 4 (facter). This branch replaces our master and Felix's octocatalog_2.1.0_makandra:

  • based on upstream master (2.3.1)
  • our patches: configurable CRL, client cert only if present, full FQDN for the cert filename, routes.yaml for catalog run mode
  • upstream PR Fixes for Ruby 3.2 #302: Ruby 3.x fixes (=~ on non-strings, Proc.new without a block, Psych DisallowedClass)
  • upstream PR Switch from puppet to openvox #347: depend on openvox < 9 instead of puppet
  • fix: PSON.parser= no longer fails if a top-level ::Parser is loaded (e.g. by the parser gem from RuboCop/tapioca)

Felix's Puppet 6, HashDiff and vendor commits are obsolete with upstream 2.3.1; #261 and the Ruby 3.2 fix are covered by #302.
Tested: ops_tools on Ruby 4.0.6 resolves and loads it (bundle install, tapioca gems --all). The fork's own rspec suite doesn't run on Ruby 4 (rspec 3.4, rubocop 0.49) – not touched here.

@marc-makandra
marc-makandra marked this pull request as draft October 31, 2026 02:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants