Fix acceptance tests

Fixes #2166

acceptance_spec/acceptance/install_spec.rb

@@ -5,17 +5,13 @@ describe "Logstash class:" do
   case fact('osfamily')
   when 'RedHat'
     core_package_name    = 'logstash'
-    contrib_package_name = 'logstash-contrib'
     service_name         = 'logstash'
     core_url             = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/logstash/master/nightly/logstash-latest.rpm'
-    contrib_url          = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/logstash/master/nightly/logstash-contrib-latest.rpm'
     pid_file             = '/var/run/logstash.pid'
   when 'Debian'
     core_package_name    = 'logstash'
-    contrib_package_name = 'logstash-contrib'
     service_name         = 'logstash'
     core_url             = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/logstash/master/nightly/logstash-latest.deb'
-    contrib_url          = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/logstash/master/nightly/logstash-contrib-latest.deb'
     pid_file             = '/var/run/logstash.pid'
   end
 
@@ -92,61 +88,5 @@ describe "Logstash class:" do
 
   end
 
-  context "Install Nightly core + contrib packages" do
-
-    it 'should run successfully' do
-      pp = "class { 'logstash': package_url => '#{core_url}', java_install => true, contrib_package_url => '#{contrib_url}', install_contrib => true }
-            logstash::configfile { 'basic_config': content => 'input { tcp { port => 2000 } } output { stdout { } } ' }
-           "
-
-      # Run it twice and test for idempotency
-      apply_manifest(pp, :catch_failures => true)
-      sleep 20
-      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
-
-    end
-
-    describe package(core_package_name) do
-      it { should be_installed }
-    end
-
-    describe package(contrib_package_name) do
-      it { should be_installed }
-    end
-
-    describe service(service_name) do
-      it { should be_enabled }
-      it { should be_running }
-    end
-
-    describe file(pid_file) do
-      it { should be_file }
-      its(:content) { should match /[0-9]+/ }
-    end
-
-    describe port(2000) do
-      it {
-        sleep 30
-        should be_listening
-      }
-    end
-
-  end
-
-  context "ensure we are still running" do
-
-    describe service(service_name) do
-      it {
-        sleep 30
-        should be_running
-      }
-    end
-
-    describe port(2000) do
-      it { should be_listening }
-    end
-
-  end
-
 end
 

acceptance_spec/acceptance/nodesets/centos-6-x64.yml

@@ -5,7 +5,7 @@ HOSTS:
       - database
       - dashboard
     platform: el-6-x86_64
-    image: jordansissel/system:centos-6.4
+    image: electrical/centos:6.4-1
     hypervisor: docker
     docker_cmd: '["/sbin/init"]'
     docker_image_commands: