From c7ea19c8c6fa2bcba0431ea42d72941c4fad72f7 Mon Sep 17 00:00:00 2001
From: Przemyslaw Kaminski <pkaminski@mirantis.com>
Date: Fri, 7 Aug 2015 11:55:21 +0200
Subject: [PATCH] Add solar-dev3 node for testing

---
 Vagrantfile          | 10 ++++++++--
 example-bootstrap.py | 15 ++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 060dd7e2..87324cf5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,7 +3,7 @@
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
-SLAVES_COUNT = 2
+SLAVES_COUNT = 3
 
 solar_script = <<SCRIPT
 ansible-playbook -i "localhost," -c local /vagrant/bootstrap/playbooks/solar.yml
@@ -46,7 +46,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     index = i + 1
     ip_index = i + 3
     config.vm.define "solar-dev#{index}" do |config|
-      config.vm.box = "ubuntu/trusty64"
+      # Box solar-dev3 is for 'solar_bootstrap' resource demo
+      if index == 3 then
+        config.vm.box = "ubuntu/trusty64"
+      else
+        # standard box with all stuff preinstalled
+        config.vm.box = "solar-master.box"
+      end
 
       #config.vm.provision "shell", inline: slave_script, privileged: true
       #config.vm.provision "shell", inline: solar_script, privileged: true
diff --git a/example-bootstrap.py b/example-bootstrap.py
index 955601b4..93867fd0 100644
--- a/example-bootstrap.py
+++ b/example-bootstrap.py
@@ -38,13 +38,15 @@ def setup_resources():
 
     signals.Connections.clear()
 
-    node1, node2 = vr.create('nodes', 'templates/nodes.yml', {})
+    node3 = vr.create('node3', 'resources/ro_node/', {
+        'ip': '10.0.0.5',
+        'ssh_key': '/vagrant/.vagrant/machines/solar-dev3/virtualbox/private_key',
+        'ssh_user': 'vagrant'
+    })[0]
 
-    solar_bootstrap1 = vr.create('solar_bootstrap1', 'resources/solar_bootstrap', {'master_ip': '10.0.0.2'})[0]
-    solar_bootstrap2 = vr.create('solar_bootstrap2', 'resources/solar_bootstrap', {'master_ip': '10.0.0.2'})[0]
+    solar_bootstrap3 = vr.create('solar_bootstrap3', 'resources/solar_bootstrap', {'master_ip': '10.0.0.2'})[0]
 
-    signals.connect(node1, solar_bootstrap1)
-    signals.connect(node2, solar_bootstrap2)
+    signals.connect(node3, solar_bootstrap3)
 
     has_errors = False
     for r in locals().values():
@@ -61,8 +63,7 @@ def setup_resources():
         sys.exit(1)
 
 resources_to_run = [
-    'solar_bootstrap1',
-    'solar_bootstrap2',
+    'solar_bootstrap3',
 ]