diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-07-06 19:36:49 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-07-06 19:36:49 -0300 |
| commit | a7e3e4c27fcb88bafe6255bdd6c60896e4f1558d (patch) | |
| tree | 66b3eac0bceadc729837e78134f82457aa7d8c43 | |
| parent | 0d6de3801d5a1859c1e3a9c70c687d7a62526850 (diff) | |
| download | puppet-bootstrap-a7e3e4c27fcb88bafe6255bdd6c60896e4f1558d.tar.gz puppet-bootstrap-a7e3e4c27fcb88bafe6255bdd6c60896e4f1558d.tar.bz2 | |
Storeconfigs support for vagrant/jessie
| -rw-r--r-- | Vagrantfile | 1 | ||||
| -rwxr-xr-x | bin/provision | 7 | ||||
| -rw-r--r-- | hiera/common.yaml | 5 | ||||
| -rw-r--r-- | puppet.conf | 7 |
4 files changed, 15 insertions, 5 deletions
diff --git a/Vagrantfile b/Vagrantfile index 116bb49..91be5b6 100644 --- 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 6e06320..8473d53 100755 --- 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 d7e35a1..8a04a26 100644 --- 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 aed5d29..ea5ed0e 100644 --- a/puppet.conf +++ b/puppet.conf @@ -1,3 +1,4 @@ -[master] - storeconfigs = true - dbadapter = sqlite3 +[main] + thin_storeconfigs = true + storeconfigs = true + dbadapter = sqlite3 |