don't always bring up 2nd node

lets you also test single node environment easily
This commit is contained in:
Sean Dague 2014-03-10 17:14:45 -04:00
parent 3a1ba75c86
commit 05f53087f9
1 changed files with 22 additions and 20 deletions

42
Vagrantfile vendored
View File

@ -38,27 +38,29 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end
end
config.vm.define "compute1" do |compute1|
compute1.vm.box = "compute1"
compute1.vm.hostname = conf['compute1_hostname']
if conf['compute1_hostname']
config.vm.define "compute1" do |compute1|
compute1.vm.box = "compute1"
compute1.vm.hostname = conf['compute1_hostname']
compute1.vm.provision "puppet" do |puppet|
puppet.manifests_path = "puppet/manifests"
puppet.module_path = "puppet/modules"
puppet.manifest_file = "default.pp"
puppet.options = "--verbose --debug"
## custom facts provided to Puppet
puppet.facter = {
## tells default.pp that we're running in Vagrant
"is_vagrant" => true,
"is_compute" => true,
"stack_pass" => conf['stack_pass'],
"stack_sshkey" => conf['stack_sshkey'],
"manager_hostname" => conf['manager_hostname']
}
if conf['devstack_git']
puppet.facter['devstack_git'] = conf['devstack_git']
puppet.facter['devstack_branch'] = conf['devstack_branch']
compute1.vm.provision "puppet" do |puppet|
puppet.manifests_path = "puppet/manifests"
puppet.module_path = "puppet/modules"
puppet.manifest_file = "default.pp"
puppet.options = "--verbose --debug"
## custom facts provided to Puppet
puppet.facter = {
## tells default.pp that we're running in Vagrant
"is_vagrant" => true,
"is_compute" => true,
"stack_pass" => conf['stack_pass'],
"stack_sshkey" => conf['stack_sshkey'],
"manager_hostname" => conf['manager_hostname']
}
if conf['devstack_git']
puppet.facter['devstack_git'] = conf['devstack_git']
puppet.facter['devstack_branch'] = conf['devstack_branch']
end
end
end
end