Hackdna/puppet modules

.gitignore

@@ -49,7 +49,6 @@ supervisord.conf
 codekit-config.json
 .vagrant/
 /deployment/puppet/.librarian/
-/deployment/puppet/.tmp/
 /deployment/puppet/Puppetfile.lock
 /deployment/aws-config/config.yaml
 /deployment/aws-config/tags.yaml

Vagrantfile

@@ -37,8 +37,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :puppet do |puppet|
     puppet.manifests_path = "deployment/puppet/manifests"
     puppet.manifest_file  = "site.pp"
-    puppet.module_path = "deployment/puppet/modules"  # requires modules dir to exist when this file is parsed
-    puppet.options = "--hiera_config /vagrant/deployment/puppet/hiera.yaml"  # to avoid missing file warning
+    puppet.hiera_config_path = "deployment/puppet/hiera.yaml"  # to avoid missing file warning
   end
 
   # workaround for services that start on boot before /vagrant is available

deployment/bootstrap.sh

@@ -8,10 +8,15 @@ export DEBIAN_FRONTEND=noninteractive
 # print commands and their expanded arguments
 set -x
 
-/usr/bin/apt-get clean && /usr/bin/apt-get -qq update && /usr/bin/apt-get -y autoremove
+/usr/bin/apt-get clean
+/usr/bin/apt-get -qq update
+/usr/bin/apt-get -y autoremove
 
 /usr/bin/apt-get -q -y install git htop nmon ruby-dev tree
 
 /usr/bin/gem install librarian-puppet -v 2.2.3 --no-rdoc --no-ri
 
-cd /vagrant/deployment/puppet && librarian-puppet install
+cd /vagrant/deployment/puppet
+librarian-puppet config path /usr/share/puppet/modules --local
+librarian-puppet config tmp /tmp --local
+librarian-puppet install

deployment/terraform/modules/ec2/main.tf

@@ -153,8 +153,12 @@ export DEBIAN_FRONTEND=noninteractive
 # print commands and their expanded arguments
 set -x
 
+export PROJECT_ROOT=/srv/refinery-platform
+
 # install dependencies
-/usr/bin/apt-get clean && /usr/bin/apt-get -qq update && /usr/bin/apt-get -y autoremove
+/usr/bin/apt-get clean
+/usr/bin/apt-get -qq update
+/usr/bin/apt-get -y autoremove
 /usr/bin/apt-get -qq -y install git htop jq nmon puppet ruby-dev tree
 
 # add extra SSH keys from Github
@@ -163,13 +167,19 @@ for USERNAME in ${join(" ", var.ssh_users)}; do
 done >> /home/ubuntu/.ssh/authorized_keys
 
 # clone Refinery Platform repo
-mkdir /srv/refinery-platform && chown ubuntu:ubuntu /srv/refinery-platform
-su -c 'git clone https://github.com/refinery-platform/refinery-platform.git /srv/refinery-platform' ubuntu
-su -c 'cd /srv/refinery-platform && /usr/bin/git checkout -q ${var.git_commit}' ubuntu
+mkdir $PROJECT_ROOT
+chown ubuntu:ubuntu $PROJECT_ROOT
+su -c "git clone https://github.com/refinery-platform/refinery-platform.git $PROJECT_ROOT" ubuntu
+su -c "cd $PROJECT_ROOT && /usr/bin/git checkout -q ${var.git_commit}" ubuntu
 
 # configure librarian-puppet
 /usr/bin/gem install librarian-puppet -v 2.2.3 --no-rdoc --no-ri
-su -c 'cd /srv/refinery-platform/deployment/puppet && /usr/local/bin/librarian-puppet install' ubuntu
+cd $PROJECT_ROOT/deployment/puppet
+# need to set $HOME: https://github.com/rodjek/librarian-puppet/issues/258
+export HOME=/root
+/usr/local/bin/librarian-puppet config path /usr/share/puppet/modules --local
+/usr/local/bin/librarian-puppet config tmp /tmp --local
+/usr/local/bin/librarian-puppet install
 
 # assign Puppet variables
 export FACTER_ADMIN_PASSWORD="${var.django_admin_password}"
@@ -203,7 +213,7 @@ export FACTER_REFINERY_WELCOME_EMAIL_MESSAGE="${var.refinery_welcome_email_messa
 export FACTER_USER_FILES_COLUMNS="${var.refinery_user_files_columns}"
 
 # run Puppet
-/usr/bin/puppet apply --modulepath=/srv/refinery-platform/deployment/puppet/modules /srv/refinery-platform/deployment/puppet/manifests/site.pp
+/usr/bin/puppet apply $PROJECT_ROOT/deployment/puppet/manifests/site.pp
 EOF
 }