Skip to content

Commit bcf4a95

Browse files
martialblogelasticdog
authored andcommitted
Updated to Ubuntu 14.04
Changed puppetlabs.list.erb to include the new Puppet Collections repository.
1 parent 6c8aab0 commit bcf4a95

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

Vagrantfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
# vi: set ft=ruby :
33

44
domain = 'example.com'
5+
box = 'ubuntu/trusty64'
6+
ram = 512
57

68
puppet_nodes = [
7-
{:hostname => 'puppet', :ip => '172.16.32.10', :box => 'precise64', :fwdhost => 8140, :fwdguest => 8140, :ram => 512},
8-
{:hostname => 'client1', :ip => '172.16.32.11', :box => 'precise64'},
9-
{:hostname => 'client2', :ip => '172.16.32.12', :box => 'precise64'},
9+
{:hostname => 'puppet', :ip => '172.16.32.10', :box => box, :fwdhost => 8140, :fwdguest => 8140, :ram => ram},
10+
{:hostname => 'client1', :ip => '172.16.32.11', :box => box},
11+
{:hostname => 'client2', :ip => '172.16.32.12', :box => box},
1012
]
1113

1214
Vagrant.configure("2") do |config|
1315
puppet_nodes.each do |node|
1416
config.vm.define node[:hostname] do |node_config|
1517
node_config.vm.box = node[:box]
16-
node_config.vm.box_url = 'http://files.vagrantup.com/' + node_config.vm.box + '.box'
18+
node_config.vm.box_url = 'https://atlas.hasicorp.com/' + node_config.vm.box
1719
node_config.vm.hostname = node[:hostname] + '.' + domain
1820
node_config.vm.network :private_network, ip: node[:ip]
1921

provision/modules/mirrors/templates/puppetlabs.list.erb

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1-
deb http://apt.puppetlabs.com <%= @lsbdistcodename %> main dependencies
2-
deb-src http://apt.puppetlabs.com <%= @lsbdistcodename %> main dependencies
1+
# Puppetlabs products
2+
deb http://apt.puppetlabs.com <%= @lsbdistcodename %> PC1
3+
deb-src http://apt.puppetlabs.com <%= @lsbdistcodename %> PC1
4+
5+
# Puppetlabs dependencies
6+
deb http://apt.puppetlabs.com <%= @lsbdistcodename %> dependencies
7+
deb-src http://apt.puppetlabs.com <%= @lsbdistcodename %> dependencies
8+
9+
# Puppetlabs devel (uncomment to activate)
10+
# deb http://apt.puppetlabs.com <%= @lsbdistcodename %> devel
11+
# deb-src http://apt.puppetlabs.com <%= @lsbdistcodename %> devel

0 commit comments

Comments
 (0)