switch to Ubuntu cloud archive

This commit is contained in:
Dan Bode
2012-10-09 22:56:49 -07:00
parent 7621262653
commit 85319ff1d6

View File

@@ -2,7 +2,13 @@
# This puppet manifest is already applied first to do some environment specific things # This puppet manifest is already applied first to do some environment specific things
# #
apt::ppa {"ppa:openstack-ubuntu-testing/folsom-trunk-testing": } apt::source { 'openstack_folsom':
location => "http://ubuntu-cloud.archive.canonical.com/ubuntu",
release => "precise-updates/folsom",
repos => "main",
required_packages => 'ubuntu-cloud-keyring',
}
# #
# configure apt to use my squid proxy # configure apt to use my squid proxy
# I highly recommend that anyone doing development on # I highly recommend that anyone doing development on
@@ -18,7 +24,7 @@ class { 'apt':
exec { '/usr/bin/apt-get update': exec { '/usr/bin/apt-get update':
require => Class['apt'], require => Class['apt'],
refreshonly => true, refreshonly => true,
subscribe => [Class['apt'], Apt::Ppa["ppa:openstack-ubuntu-testing/folsom-trunk-testing"]], subscribe => [Class['apt'], Apt::Source["openstack_folsom"]],
logoutput => true, logoutput => true,
} }
@@ -26,12 +32,13 @@ exec { '/usr/bin/apt-get update':
# specify a connection to the hardcoded puppet master # specify a connection to the hardcoded puppet master
# #
host { host {
'puppet': ip => '172.16.0.2'; 'puppet': ip => '172.16.0.2';
'glance': ip => '172.16.0.6'; 'openstackcontroller': ip => '172.16.0.3';
'keystone': ip => '172.16.0.7'; 'compute1': ip => '172.16.0.4';
'mysql': ip => '172.16.0.8'; 'novacontroller': ip => '172.16.0.5';
'novacontroller': ip => '172.16.0.5'; 'glance': ip => '172.16.0.6';
'compute1': ip => '172.16.0.4'; 'keystone': ip => '172.16.0.7';
'mysql': ip => '172.16.0.8';
} }
group { 'puppet': group { 'puppet':