Minor corrections

bin/puppet_setup.sh

@@ -18,10 +18,12 @@ echo_subtitle "Installing with /bin/gem"
 gem install deep_merge
 gem install hiera-eyaml
 gem install r10k
-echo_subtitle "Installing with /opt/puppetlabs/puppet/bin/gem"
-/opt/puppetlabs/puppet/bin/gem install deep_merge
-/opt/puppetlabs/puppet/bin/gem install hiera-eyaml
-/opt/puppetlabs/puppet/bin/gem install r10k
+if [ -x /opt/puppetlabs/puppet/bin/gem ]; then
+  echo_subtitle "Installing with /opt/puppetlabs/puppet/bin/gem"
+  /opt/puppetlabs/puppet/bin/gem install deep_merge
+  /opt/puppetlabs/puppet/bin/gem install hiera-eyaml
+  /opt/puppetlabs/puppet/bin/gem install r10k
+fi
 
 echo_title "Installing rsync"
 puppet resource package rsync ensure=present

vagrant/environments/enterprise/Vagrantfile

@@ -95,13 +95,15 @@ Vagrant.configure("2") do |config|
       end
 
       if role != 'puppet'
-        # register destroy trigger to remove the node from puppet master
-        node_config.trigger.after :destroy do
-          node_name = @machine.name.to_s
-          puts "Cleaning #{node_name} certificate from puppet"
-          `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet cert clean #{node_name}.#{settings['network']['domain']}'`
-          puts "Deactivating #{node_name} from puppet"
-          `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet node deactivate #{node_name}.#{settings['network']['domain']}'`
+        if Vagrant.has_plugin?("vagrant-hostmanager")
+          # register destroy trigger to remove the node from puppet master
+          node_config.trigger.after :destroy do
+            node_name = @machine.name.to_s
+            puts "Cleaning #{node_name} certificate from puppet"
+            `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet cert clean #{node_name}.#{settings['network']['domain']}'`
+            puts "Deactivating #{node_name} from puppet"
+            `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet node deactivate #{node_name}.#{settings['network']['domain']}'`
+          end
         end
       end
 

vagrant/environments/ostest/Vagrantfile

@@ -94,13 +94,15 @@ Vagrant.configure("2") do |config|
       end
 
       if role != 'puppet'
-        # register destroy trigger to remove the node from puppet master
-        node_config.trigger.after :destroy do
-          node_name = @machine.name.to_s
-          puts "Cleaning #{node_name} certificate from puppet"
-          `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet cert clean #{node_name}.#{settings['network']['domain']}'`
-          puts "Deactivating #{node_name} from puppet"
-          `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet node deactivate #{node_name}.#{settings['network']['domain']}'`
+        if Vagrant.has_plugin?("vagrant-hostmanager")
+          # register destroy trigger to remove the node from puppet master
+          node_config.trigger.after :destroy do
+            node_name = @machine.name.to_s
+            puts "Cleaning #{node_name} certificate from puppet"
+            `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet cert clean #{node_name}.#{settings['network']['domain']}'`
+            puts "Deactivating #{node_name} from puppet"
+            `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet node deactivate #{node_name}.#{settings['network']['domain']}'`
+          end
         end
       end
 

vagrant/environments/puppetinfra/Vagrantfile

@@ -95,13 +95,15 @@ Vagrant.configure("2") do |config|
       end
 
       if role != 'puppet'
-        # register destroy trigger to remove the node from puppet master
-        node_config.trigger.after :destroy do
-          node_name = @machine.name.to_s
-          puts "Cleaning #{node_name} certificate from puppet"
-          `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet cert clean #{node_name}.#{settings['network']['domain']}'`
-          puts "Deactivating #{node_name} from puppet"
-          `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet node deactivate #{node_name}.#{settings['network']['domain']}'`
+      if Vagrant.has_plugin?("vagrant-hostmanager")
+          # register destroy trigger to remove the node from puppet master
+          node_config.trigger.after :destroy do
+            node_name = @machine.name.to_s
+            puts "Cleaning #{node_name} certificate from puppet"
+            `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet cert clean #{node_name}.#{settings['network']['domain']}'`
+            puts "Deactivating #{node_name} from puppet"
+            `vagrant ssh #{puppet_master_hostname} -- -t 'sudo puppet node deactivate #{node_name}.#{settings['network']['domain']}'`
+          end
         end
       end