From 7517e0cb8bb9152553b66068642c21a6e7c9aba1 Mon Sep 17 00:00:00 2001 From: Charles Short Date: Tue, 26 Oct 2021 11:09:46 -0400 Subject: [PATCH] Remove default /etc/puppet/hiera.yaml Remove default hiera.yaml since we ship our own hiera.yaml in puppet-manifests and it caused conflicts when both are installed on the same system. Story: 2009101 Task: 43247 Signed-off-by: Charles Short Change-Id: I053f7d7bff9291a0c09539c2959a143634744401 --- .../0001-Remove-default-hiera-config.patch | 49 +++++++++++++++++++ .../puppet-5.5.22/debian/deb_patches/series | 1 + 2 files changed, 50 insertions(+) create mode 100644 config/puppet-5.5.22/debian/deb_patches/0001-Remove-default-hiera-config.patch create mode 100644 config/puppet-5.5.22/debian/deb_patches/series diff --git a/config/puppet-5.5.22/debian/deb_patches/0001-Remove-default-hiera-config.patch b/config/puppet-5.5.22/debian/deb_patches/0001-Remove-default-hiera-config.patch new file mode 100644 index 000000000..4faa0586b --- /dev/null +++ b/config/puppet-5.5.22/debian/deb_patches/0001-Remove-default-hiera-config.patch @@ -0,0 +1,49 @@ +From e04e7a99a049b3dadcf7f26db8198e01d25f1d5f Mon Sep 17 00:00:00 2001 +From: Charles Short +Date: Tue, 26 Oct 2021 11:54:45 -0400 +Subject: [PATCH] Remove default hiera config + +Remove the default puppet hiera.yaml so it wont conflict +with the hiera.yaml shipped in the puppet-manifests +package. + +Signed-off-by: Charles Short +--- + debian/puppet.install | 1 - + debian/rules | 4 +++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/debian/puppet.install b/debian/puppet.install +index 323c342f83..b338ec1191 100644 +--- a/debian/puppet.install ++++ b/debian/puppet.install +@@ -3,5 +3,4 @@ + /usr/lib/ruby/vendor_ruby/* + /usr/share/puppet/locale + ext/ldap/puppet.schema /etc/ldap/schema +-debian/conffiles/hiera.yaml /etc/puppet + debian/conffiles/puppet.conf /etc/puppet +diff --git a/debian/rules b/debian/rules +index 60100a243a..c0eda262bd 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -19,13 +19,15 @@ override_dh_auto_install: + rm -vfr debian/tmp/usr/lib/ruby/vendor_ruby/puppet/vendor/rgen/ + rm -vfr debian/tmp/usr/lib/ruby/vendor_ruby/puppet/vendor/deep_merge/ + rm -vfr debian/tmp/usr/lib/ruby/vendor_ruby/puppet/vendor/pathspec/LICENSE ++ # We dont ship the default since it conflics with puppet-manifests ++ rm -vfr debian/tmp/etc/puppet/hiera.yaml + + override_dh_auto_build: + dh_auto_build + HOME=$$(mktemp -d) LC_ALL=C.UTF-8 rake gen_manpages + + override_dh_install: +- dh_install -Xusr/share/man ++ dh_install -Xusr/share/man -Xetc/puppet/hiera.yaml + mv debian/puppet-master-passenger/usr/share/puppet-master-passenger/example-passenger-vhost.conf \ + debian/puppet-master-passenger/usr/share/puppet-master-passenger/apache2.site.conf.tmpl + +-- +2.25.1 + diff --git a/config/puppet-5.5.22/debian/deb_patches/series b/config/puppet-5.5.22/debian/deb_patches/series new file mode 100644 index 000000000..a22973709 --- /dev/null +++ b/config/puppet-5.5.22/debian/deb_patches/series @@ -0,0 +1 @@ +0001-Remove-default-hiera-config.patch