Merge pull request #106 from smarterclayton/add_atomic_test_env

Add an Atomic test environment

Author: smarterclayton

Vagrantfile

@@ -9,25 +9,39 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
 
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "fedora20"
+  config.vm.define "default", primary: true do |config|
+    config.vm.box = "fedora20"
+    config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box"
+
+    config.vm.network "forwarded_port", guest: 43273, host: 43273
+    config.vm.network "forwarded_port", guest: 6060, host: 2225
+    config.vm.network "forwarded_port", guest: 14000, host: 14000
+    for i in 4000..4050
+      config.vm.network :forwarded_port, guest: i, host: i
+    end
+  end
+
+  config.vm.define "rhel-7-atomic" do |config|
+    config.vm.box = "rhel-7-atomic"
+    config.vm.box_url = "http://rcm-img06.build.bos.redhat.com/images/releases/2014.8/vagrant/rh-atomic-host-vagrant-2014.8.box"
+
+    config.vm.network "forwarded_port", guest: 43273, host: 53273
+    config.vm.network "forwarded_port", guest: 6060, host: 12225
+    config.vm.network "forwarded_port", guest: 14000, host: 24000
+    for i in 4000..4050
+      config.vm.network :forwarded_port, guest: i, host: i+1000
+    end
 
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system.
-  config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-20_chef-provisionerless.box"
+    config.vm.provider "virtualbox" do |v|
+      v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+    end
+  end
 
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.
   # config.vm.network :forwarded_port, guest: 80, host: 8080
 
-  config.vm.network "forwarded_port", guest: 43273, host: 43273
-  config.vm.network "forwarded_port", guest: 6060, host: 2225
-  config.vm.network "forwarded_port", guest: 14000, host: 14000
-  for i in 4000..4050
-    config.vm.network :forwarded_port, guest: i, host: i
-  end
-
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
   # config.vm.network :private_network, ip: "192.168.33.10"

contrib/demo/demo.sh

@@ -21,7 +21,7 @@ if [ "$SKIP_EAP" == "" ]; then
   run "$base/drive_load.sh &"
 
   run gear start localhost/demo-backend-3
-  run journalctl --unit ctr-demo-backend-3.service -f --since=-3 -q
+  run sudo journalctl --unit ctr-demo-backend-3.service -f --since=-3 -q
 fi
 
 gear stop localhost/demo-backend-{1,2,3} > /dev/null &
@@ -30,22 +30,22 @@ if [ "$SKIP_MONGO" == "" ]; then
   run cat $base/mongo_Dockerfile
 
   run gear deploy $base/deploy_mongo_repl_set.json localhost
-  run journalctl --unit ctr-replset-db-1 -f --since=-3 -q
+  run sudo journalctl --unit ctr-replset-db-1 -f --since=-3 -q
   run "sudo switchns --container=replset-db-1 -- /usr/bin/mongo local --eval 'printjson(rs.initiate({_id: \"replica0\", version: 1, members:[{_id: 0, host:\"192.168.1.1:27017\"},{_id: 1, host:\"192.168.1.2:27017\"},{_id: 2, host:\"192.168.1.3:27017\"}]}))'" #; printjson(rs.add(\"192.168.1.2\")); printjson(rs.add(\"192.168.1.3\"))'"
   run "sudo switchns --container=replset-db-1 -- /usr/bin/mongo local --eval 'printjson(rs.status())'"
   run "sudo switchns --container=replset-db-1 -- /usr/bin/mongo local --eval 'printjson(rs.status())'"
 
   run gear build git://github.com/pmorie/scaling-demo-update jboss/eap openshift/demo-eap-scaling-test
   run gear install openshift/demo-eap-scaling-test localhost/demo-backend-3 -p 8080:0
   run gear start localhost/demo-backend-3
-  run journalctl -u ctr-demo-backend-3 -f
+  run sudo journalctl -u ctr-demo-backend-3 -f
 fi
 
 gear stop --with=$base/deploy_mongo_repl_set_instances.json > /dev/null &
 
 if [ "$SKIP_ORIGIN" == "" ]; then
   run gear deploy $base/deploy_openshift.json localhost
-  run journalctl --unit ctr-openshift-broker-1 -f --since=-3 -q
+  run sudo journalctl --unit ctr-openshift-broker-1 -f --since=-3 -q
   run sudo switchns --container="openshift-broker-1" --env="BROKER_SOURCE=1" --env="HOME=/opt/ruby" --env="OPENSHIFT_BROKER_DIR=/opt/ruby/src/broker" -- /bin/bash --login -c "/opt/ruby/src/docker/openshift_init"
   run rhc setup --server http://localhost:6060/broker/rest/api
   run rhc create-app test jbosseap-6.0 --no-git --no-dns