From d86456f8d6fb96511aad6bf730f658864d60c00c Mon Sep 17 00:00:00 2001 From: Metin de Vreugd Date: Sat, 15 Aug 2015 01:04:40 +0200 Subject: [PATCH] Set fqdn for sensu client name --- Vagrantfile | 12 ++++++------ tests/provision_client.sh | 1 + tests/provision_server.sh | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 002b17092a..72893b9a99 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -18,21 +18,21 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.define "sensu-server", primary: true, autostart: true do |server| server.vm.box = "ubuntu/trusty64" - server.vm.hostname = 'sensu-server' + server.vm.hostname = 'sensu-server.example.com' server.vm.network :private_network, ip: "192.168.56.10" server.vm.provision :shell, :path => "tests/provision_server.sh" - server.vm.provision :puppet, :manifests_path => ["vm","/vagrant/tests"], :manifest_file => "rabbitmq.pp" - server.vm.provision :puppet, :manifests_path => ["vm","/vagrant/tests"], :manifest_file => "sensu-server.pp" - server.vm.provision :puppet, :manifests_path => ["vm","/vagrant/tests"], :manifest_file => "uchiwa.pp" + server.vm.provision :puppet, :manifests_path => ["vm","/vagrant/tests"], :manifest_file => "rabbitmq.pp", :options => "--hiera_config /etc/hiera.yaml" + server.vm.provision :puppet, :manifests_path => ["vm","/vagrant/tests"], :manifest_file => "sensu-server.pp", :options => "--hiera_config /etc/hiera.yaml" + server.vm.provision :puppet, :manifests_path => ["vm","/vagrant/tests"], :manifest_file => "uchiwa.pp", :options => "--hiera_config /etc/hiera.yaml" server.vm.provision :shell, :path => "tests/rabbitmq.sh" end config.vm.define "sensu-client", autostart: true do |client| client.vm.box = "ubuntu/trusty64" - client.vm.hostname = 'sensu-client' + client.vm.hostname = 'sensu-client.example.com' client.vm.network :private_network, ip: "192.168.56.11" client.vm.provision :shell, :path => "tests/provision_client.sh" - client.vm.provision :puppet, :manifests_path => ["vm","/vagrant/tests"], :manifest_file => "sensu-client.pp" + client.vm.provision :puppet, :manifests_path => ["vm","/vagrant/tests"], :manifest_file => "sensu-client.pp", :options => "--hiera_config /etc/hiera.yaml" end end diff --git a/tests/provision_client.sh b/tests/provision_client.sh index 78bb5cf051..9ed969199b 100644 --- a/tests/provision_client.sh +++ b/tests/provision_client.sh @@ -7,4 +7,5 @@ wget --quiet http://apt.puppetlabs.com/puppetlabs-release-precise.deb -O /tmp/pu dpkg -i /tmp/puppetlabs-release-precise.deb apt-get update apt-get install -y ruby-json puppet-common #masterless puppet +sed -i '/templatedir/d' /etc/puppet/puppet.conf puppet module install sensu/sensu diff --git a/tests/provision_server.sh b/tests/provision_server.sh index f1de293f51..e8e92fb1fc 100644 --- a/tests/provision_server.sh +++ b/tests/provision_server.sh @@ -7,5 +7,7 @@ wget --quiet http://apt.puppetlabs.com/puppetlabs-release-precise.deb -O /tmp/pu dpkg -i /tmp/puppetlabs-release-precise.deb apt-get update apt-get install -y ruby-json redis-server puppet-common #masterless puppet +sed -i '/templatedir/d' /etc/puppet/puppet.conf puppet module install sensu/sensu -puppet module install puppetlabs/rabbitmq \ No newline at end of file +puppet module install puppetlabs/rabbitmq +