Revert: puppetdb->7.13.0,postgres->9.2.0 - instance not supported

mergwyn · Dec 10, 2023 · 7dcd74d · 7dcd74d
1 parent fcae6fc
commit 7dcd74d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -5,9 +5,6 @@ fixtures:
     profile: "#{source_dir}/site-modules/profile"
     role: "#{source_dir}/site-modules/role"
   repositories:
-    puppetdb:
-      repo: https://github.com/puppetlabs/puppetlabs-puppetdb
-      tag: 7.14.0
     backuppc:
       repo: https://github.com/mergwyn/mergwyn-backuppc
       ref: master
@@ -125,10 +122,10 @@ fixtures:
       ref: 10.1.0
     postgresql:
       repo: puppetlabs-postgresql
-      ref: 10.0.2
-    #puppetdb:
-    #  repo: puppetlabs-puppetdb
-    #  ref: 7.13.0
+      ref: 9.2.0
+    puppetdb:
+      repo: puppetlabs-puppetdb
+      ref: 7.13.0
     puppetserver_gem:
       repo: puppetlabs-puppetserver_gem
       ref: 1.1.1

diff --git a/Puppetfile b/Puppetfile
@@ -40,9 +40,8 @@ mod 'puppetlabs-inifile', '6.1.0'
 mod 'puppetlabs-mailalias_core', '1.1.0'
 mod 'puppetlabs-mysql', '15.0.0'
 mod 'puppetlabs-ntp', '10.1.0'
-mod 'puppetlabs-postgresql', '10.0.2'
-#mod 'puppetlabs-puppetdb', '7.13.0'
-mod 'puppetlabs-puppetdb', :git => 'https://github.com/puppetlabs/puppetlabs-puppetdb', :tag => '7.14.0'
+mod 'puppetlabs-postgresql', '9.2.0'
+mod 'puppetlabs-puppetdb', '7.13.0'
 mod 'puppetlabs-puppetserver_gem', '1.1.1'
 mod 'puppetlabs-reboot', '5.0.0'
 mod 'puppetlabs-sshkeys_core', '2.4.0'