stackforge/puppet-openstack
Code Issues Proposed changes

Updating rake and vagrant file.

Browse Source 
vagrantfile - added the local repo location for our
internal boxes.

rakefile - fixed typo.
This commit is contained in:
Dan Bode
2011-07-12 13:20:13 -07:00
parent ee1094abca
commit ca4a217a67
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Rakefile
View File

@@ -23,7 +23,7 @@ namespace :build do
end end
desc 'build out openstack on one node' desc 'build out openstack on one node'
task :single do task :single do
build(:single, env) build(:all, env)
end end
end end

10
Vagrantfile vendored
View File

@@ -11,7 +11,7 @@ Vagrant::Config.run do |config|
config.vm.box = "#{box}" config.vm.box = "#{box}"
config.vm.box_url = "#{remote_url_base}/#{box}.vbox" config.vm.box_url = "http://faro.puppetlabs.lan/vagrant/#{box}.vbox"
config.vm.customize do |vm| config.vm.customize do |vm|
vm.memory_size = 768 vm.memory_size = 768
vm.cpu_count = 1 vm.cpu_count = 1
@@ -21,16 +21,10 @@ Vagrant::Config.run do |config|
# the master runs apply to configure itself # the master runs apply to configure itself
config.vm.define :puppetmaster do |pm| config.vm.define :puppetmaster do |pm|
pm.vm.forward_port("http", 8140, 8140)
ssh_forward = ssh_forward + 1 ssh_forward = ssh_forward + 1
pm.vm.forward_port('ssh', 22, ssh_forward, :auto => true) pm.vm.forward_port('ssh', 22, ssh_forward, :auto => true)
# hard-coding this b/c it is important
pm.vm.network("#{net_base}.10") pm.vm.network("#{net_base}.10")
#pm.vm.provision :puppet do |puppet| pm.vm.provision :shell, :path => 'scripts/run-puppetmaster.sh'
# puppet.manifest_file = "master.pp"
# puppet.options = ["--certname","puppetmaster", '--modulepath', '/vagrant/modules']
#end
end end
config.vm.define :all do |all| config.vm.define :all do |all|