Fix tests and bump version

Author: Vic Iglesias

.kitchen.yml

@@ -11,7 +11,6 @@ platforms:
       box: chef/centos-6.5
       network:
       - ["forwarded_port", {guest: 8080, host: 8080}]
-      - ["forwarded_port", {guest: 80, host: 8888}]
       customize:
         cpus: 2
         memory: 3024
@@ -23,10 +22,5 @@ suites:
       - recipe[midokura]
     attributes:
       midokura:
-        repo-username: 'eucalyptus'
-        repo-password: '8yU8Pj6h'
         midolman-host-mapping:
           'default-centos-65.vagrantup.com': '10.0.2.15'
-        tomcat-url: "<param-value>http://default-centos-65.vagrantup.com:8080/midonet-api</param-value>"
-
-

metadata.rb

@@ -4,7 +4,7 @@
 license          'BSD'
 description      'Installs/Configures midokura'
 long_description 'Installs/Configures midokura'
-version          '0.1.0'
+version          '0.2.0'
 depends          'java'
 depends          'yum-epel'
 depends          'cassandra'

test/integration/default/serverspec/default_spec.rb

@@ -1,24 +1,17 @@
 require 'serverspec'
 
-include Serverspec::Helper::Exec
-include Serverspec::Helper::DetectOS
-
-RSpec.configure do |c|
-  c.before :all do
-    c.path = '/sbin:/usr/sbin'
-  end
-end
+set :backend, :exec
 
 describe "Midokura Default" do
   ### Ensure packages are installed
-  %w{zookeeper dsc20 tomcat6 httpd midolman midonet-cp}.each do |package_name|
+  %w{zookeeper dsc20 tomcat6 midolman}.each do |package_name|
        describe package(package_name) do
          it { should be_installed }
        end
   end
 
   ### Ensure services are enabled (midolman does not allow itself to be enabled)
-  %w{zookeeper cassandra httpd tomcat6}.each do |service_name|
+  %w{zookeeper cassandra tomcat6}.each do |service_name|
      describe service(service_name) do
        it { should be_enabled }
        it { should be_running }
@@ -30,22 +23,17 @@
 
   ### Ensure ports are open for:
   ### midonet-api midonet-cp zookeeper cassandra
-  %w{8080 80 2181 9160 7199 9042 7000}.each do |port_number|
+  %w{8080 2181 9160 7199 9042 7000}.each do |port_number|
      describe port(port_number) do
        it { should be_listening }
      end
   end
 
   ### Check midonet-api
   describe command('curl http://localhost:8080/') do
-    it { should return_exit_status 0 }
+    its(:exit_status) { should eq 0 }
   end
   describe command('curl http://localhost:8080/midonet-api/') do
-    it { should return_exit_status 0 }
-  end
-
-  ### Check midonet-cp
-  describe command('curl http://localhost/midonet-cp/') do
-    it { should return_exit_status 0 }
+    its(:exit_status) { should eq 0 }
   end
 end