Remove ppa update

I should be able to start using the regular precise packages.
This commit is contained in:
Dan Bode 2012-04-16 10:10:57 -07:00
parent 0cd556659f
commit 97a6e6596b
1 changed files with 17 additions and 17 deletions

View File

@ -24,22 +24,22 @@ resources { 'nova_config':
purge => true,
}
if $::osfamily == 'Debian' {
# temporarily update this to use the
# latest tested packages from precise
# eventually, these packages need to be moved
# to the openstack module
stage { 'nova_ppa':
before => Stage['main']
}
class { 'apt':
stage => 'nova_ppa',
}
class { 'keystone::repo::trunk':
stage => 'nova_ppa',
}
}
#if $::osfamily == 'Debian' {
# # temporarily update this to use the
# # latest tested packages from precise
# # eventually, these packages need to be moved
# # to the openstack module
# stage { 'nova_ppa':
# before => Stage['main']
# }
#
# class { 'apt':
# stage => 'nova_ppa',
# }
# class { 'keystone::repo::trunk':
# stage => 'nova_ppa',
# }
#}
# this is a hack that I have to do b/c openstack nova
# sets up a route to reroute calls to the metadata server
@ -183,7 +183,7 @@ class { 'nova::compute::libvirt':
}
nova::network::bridge { 'br100':
ip => '192.168.188.1',
ip => '11.0.0.1',
netmask => '255.255.255.0',
}