Skip to content
Browse files

updating my vagrant file, manifests and scripts

  • Loading branch information...
1 parent 4da89a3 commit b94c5f92092361f1fb13b96ab23bcf8825577140 @bodepd committed Jun 24, 2011
Showing with 9 additions and 10 deletions.
  1. +4 −5 Vagrantfile
  2. +4 −4 manifests/site.pp
  3. +1 −1 scripts/run.sh
View
9 Vagrantfile
@@ -5,20 +5,19 @@ Vagrant::Config.run do |config|
remote_url_base = ENV['REMOTE_VAGRANT_STORE']
config.vm.box = "#{box}"
- config.vm.box_url = "http://faro.puppetlabs.lan/vagrant/#{box}.box"
config.ssh.forwarded_port_key = "ssh"
- ssh_forward = 2231
+ ssh_forward = 2222
config.vm.box = "#{box}"
- config.vm.box_url = "http://faro.puppetlabs.lan/vagrant/#{box}.vbox"
+ config.vm.box_url = "#{remote_url_base}/#{box}.vbox"
config.vm.customize do |vm|
vm.memory_size = 768
vm.cpu_count = 1
end
- net_base = "172.20.0"
+ net_base = "172.21.0"
# the master runs apply to configure itself
config.vm.define :puppetmaster do |pm|
@@ -52,7 +51,7 @@ Vagrant::Config.run do |config|
ssh_forward = ssh_forward + 1
rabbit.vm.forward_port('ssh', 22, ssh_forward, :auto => true)
rabbit.vm.network("#{net_base}.13")
- rabbit.vm.provision :shell, :path => 'scripts/run-rabbit.sh'
+ rabbit.vm.provision :shell, :path => 'scripts/run-rabbitmq.sh'
end
config.vm.define :controller do |controller|
ssh_forward = ssh_forward + 1
View
8 manifests/site.pp
@@ -30,8 +30,8 @@
class { 'mysql::ruby': }
class { 'nova::db':
password => $db_password,
- dbname => $db_user,
- user => $db_name,
+ dbname => $db_name,
+ user => $db_username,
host => $clientcert,
# does glance need access?
allowed_hosts => ['controller', 'glance', 'compute'],
@@ -68,15 +68,15 @@
api_port => 8773,
aws_address => '169.254.169.254',
}
- class { 'nova::compute::libvirt':
+ class { 'nova::compute::libvirt':
libvirt_type => 'qemu',
flat_network_bridge => 'br100',
flat_network_bridge_ip => '11.0.0.1',
flat_network_bridge_netmask => '255.255.255.0',
}
class { "nova":
verbose => $verbose,
- sql_connection => "mysql://${db_user}:${db_password}@${db_host}/${db_name}",
+ sql_connection => "mysql://${db_username}:${db_password}@${db_host}/${db_name}",
image_service => $image_service,
glance_api_servers => $glance_api_servers,
glance_host => $glance_host,
View
2 scripts/run.sh
@@ -1,3 +1,3 @@
#!/bin/bash
puppet apply /vagrant/manifests/hosts.pp
-puppet apply --certname $1 /vagrant/manifests/site.pp --modulepath /vagrant/modules
+puppet apply /vagrant/manifests/site.pp --modulepath /vagrant/modules --graph --certname $* --graphdir /vagrant/graphs

0 comments on commit b94c5f9

Please sign in to comment.
Something went wrong with that request. Please try again.