Merge pull request #580 from DataDog/albertvaka/centos-test

Add centos test machine

Author: albertvaka

.gitignore

@@ -8,7 +8,8 @@ Gemfile.lock
 .rbenv-gemsets
 .ruby-version
 
-tests/.vagrant
+tests/centos/.vagrant
+tests/ubuntu/.vagrant
 
 # mac stuff
 .DS_Store

tests/README.md

@@ -9,23 +9,25 @@ This is an example setup, based on vagrant + virtualbox, that allows to easily r
 
 # Setup
 
-in `puppet-datadog-agent/tests`:
+in `puppet-datadog-agent/tests/ubuntu` or `puppet-datadog-agent/tests/centos`:
 
 - provision VM: `vagrant up`
 - connect to the VM to check the configuration: `vagrant ssh`
 - destroy VM when needed: `vagrant destroy -f`
 
 ## Module installation
 
-- The default `Puppetfile` installs the latest released version of the module from Puppetforge.
+- The default `Puppetfile` (in `environment/Puppetfile`) installs the latest released version of the module from Puppetforge.
 - To use your development branch instead edit the Puppetfile et replace the `datadog-datadog_agent` with:
 ```
 mod 'datadog-datadog_agent',
   :git    => 'https://github.com/DataDog/puppet-datadog-agent',
-    :branch => '<my_branch>'
+  :branch => '<my_branch>'
 ```
 
-- We can also build the module locally using the `puppet build` or `pdk build` command, upload the archive to the VM and install it with `sudo /opt/puppetlabs/bin/puppet module install datadog-datadog_agent-x.y.z.tar.gz --target-dir /home/vagrant/puppet/modules`
+- We can also build the module locally using the `puppet build` or `pdk build` command, upload the archive to the VM and install it with:
+  - Ubuntu VM: `sudo /opt/puppetlabs/bin/puppet module install datadog-datadog_agent-x.y.z.tar.gz --target-dir /home/vagrant/puppet/modules`
+  - CentOS VM: `sudo /usr/local/bin/puppet module install datadog-datadog_agent-x.y.z.tar.gz --target-dir /home/vagrant/puppet/modules`
 
 
 ## Manifest
@@ -35,4 +37,5 @@ We can edit the manifest and run `vagrant up --provision` to upload the new vers
 
 # Test
 
-In the VM, run `sudo /opt/puppetlabs/bin/puppet apply --modulepath=./modules ./manifests/site.pp` in `/home/vagrant/puppet` to apply to manifest on the VM.
+In the CentOS VM, run `sudo /usr/local/bin/puppet apply --modulepath=./modules ./manifests/site.pp` in `/home/vagrant/puppet` to apply to manifest on the VM.
+In the Ubuntu VM, run `sudo /opt/puppetlabs/bin/puppet apply --modulepath=./modules ./manifests/site.pp` in `/home/vagrant/puppet` to apply to manifest on the VM.

tests/centos/Vagrantfile

@@ -0,0 +1,11 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "generic/centos8"
+  config.vm.provision "file", source: "../environment", destination: "$HOME/puppet"
+  config.vm.provision "shell", inline: <<-SHELL
+    sudo yum install -y gem nano
+    sudo gem install puppet r10k
+    echo 'export PATH=$PATH:/usr/local/bin' | sudo tee /etc/bashrc
+    cd /home/vagrant/puppet
+    /usr/local/bin/r10k puppetfile install
+  SHELL
+end

tests/environment/Puppetfile

@@ -4,4 +4,5 @@ mod 'puppetlabs-concat', '4.0.0'
 mod 'puppetlabs-puppetserver_gem', '1.0.0'
 mod 'puppetlabs-ruby', '1.0.0'
 mod 'puppetlabs-stdlib', '4.24.0'
-mod 'puppetlabs-powershell', '2.3.0'
+mod 'puppetlabs-powershell', '2.3.0'
+mod 'puppetlabs-yumrepo_core', '1.0.3'

tests/environment/manifests/site.pp

@@ -1,4 +1,4 @@
-node "localhost" {
+node default {
     class { "datadog_agent":
        api_key => "somenonnullapikeythats32charlong",
    }

tests/Vagrantfile tests/ubuntu/Vagrantfiletests/Vagrantfile renamed to tests/ubuntu/Vagrantfile

@@ -1,10 +1,10 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "puppetlabs/ubuntu-16.04-64-puppet"
   config.vm.box_version = "1.0.0"
-  config.vm.provision "file", source: "./environment", destination: "$HOME/puppet"
+  config.vm.provision "file", source: "../environment", destination: "$HOME/puppet"
   config.vm.provision "shell", inline: <<-SHELL
-    /opt/puppetlabs/puppet/bin/gem install r10k -v 2.6.4
+    /opt/puppetlabs/puppet/bin/gem install r10k -v 2.6.7
     cd /home/vagrant/puppet
     sudo /opt/puppetlabs/puppet/bin/r10k puppetfile install
   SHELL
-end
+end