Storeconfigs support for vagrant/jessie

diff --git a/Vagrantfile b/Vagrantfile
index 116bb490e258c99761f879ea11d3abf6769bb8ce..91be5b60c65c0aacadc4834e95938e910bd94a47 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -17,7 +17,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     puppet.working_directory = "/etc/puppet"
     puppet.hiera_config_path = "hiera.yaml"
   end
-  # end
 
   # Share hiera configuration.
   config.vm.synced_folder "puppet/hiera", "/etc/puppet/hiera"

diff --git a/bin/provision b/bin/provision
index 6e06320c1354dbebfe8b9d8e16a08b9a262b727c..8473d53255261bf6838ee5d73c98974b1339fa0f 100755 (executable)
--- a/bin/provision
+++ b/bin/provision
@@ -15,7 +15,12 @@ $sudo apt-get update && DEBIAN_FRONTEND=noninteractive $sudo apt-get dist-upgrad
 source /vagrant/puppet/bin/dependencies
 
 # Ensure additional dependencies are installed.
-for package in ruby-sqlite3 usbutils; do
+for package in usbutils; do
+  provision_package $package
+done
+
+# Storeconfigs support
+for package in ruby-sqlite3 ruby-activerecord ruby-activerecord-deprecated-finders; do
   provision_package $package
 done
 

diff --git a/hiera/common.yaml b/hiera/common.yaml
index d7e35a1102102c779d427f7a67b290e93cba55df..8a04a2625b94a98dff93938c700d92dcfd18cf12 100644 (file)
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -48,3 +48,8 @@ ntp::servers:
 nodo::subsystem::resolver::nameservers:
   - '208.67.222.222'
   - '208.67.220.220'
+
+#
+# Puppet config
+#
+nodo::base::puppet_mode: 'apply'

diff --git a/puppet.conf b/puppet.conf
index aed5d298438b065ad44f14da223f14807c60ef15..ea5ed0efb88c8588c416da287bb3849f0f5d6ac4 100644 (file)
--- a/puppet.conf
+++ b/puppet.conf
@@ -1,3 +1,4 @@
-[master]
-  storeconfigs = true
-  dbadapter    = sqlite3
+[main]
+  thin_storeconfigs = true
+  storeconfigs      = true
+  dbadapter         = sqlite3