x/solar
Code Issues Proposed changes

Add solar-dev3 node for testing

Browse Source
This commit is contained in:
Przemyslaw Kaminski 2015-08-07 11:55:21 +02:00
parent beb6b8536f
commit c7ea19c8c6
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Vagrantfile vendored
View File

@ -3,7 +3,7 @@
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2" VAGRANTFILE_API_VERSION = "2"
SLAVES_COUNT = 2 SLAVES_COUNT = 3
solar_script = <<SCRIPT solar_script = <<SCRIPT
ansible-playbook -i "localhost," -c local /vagrant/bootstrap/playbooks/solar.yml 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 index = i + 1
ip_index = i + 3 ip_index = i + 3
config.vm.define "solar-dev#{index}" do |config| 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: slave_script, privileged: true
#config.vm.provision "shell", inline: solar_script, privileged: true #config.vm.provision "shell", inline: solar_script, privileged: true

15
example-bootstrap.py
View File

@ -38,13 +38,15 @@ def setup_resources():
signals.Connections.clear() 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_bootstrap3 = vr.create('solar_bootstrap3', '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]
signals.connect(node1, solar_bootstrap1) signals.connect(node3, solar_bootstrap3)
signals.connect(node2, solar_bootstrap2)
has_errors = False has_errors = False
for r in locals().values(): for r in locals().values():
@ -61,8 +63,7 @@ def setup_resources():
sys.exit(1) sys.exit(1)
resources_to_run = [ resources_to_run = [
'solar_bootstrap1', 'solar_bootstrap3',
'solar_bootstrap2',
] ]