diff options
| author | Dimitrios Apostolou <jimis@qt.io> | 2020-04-14 12:23:59 +0200 |
|---|---|---|
| committer | Dimitrios Apostolou <jimis@qt.io> | 2020-04-15 08:16:13 +0000 |
| commit | ba38215cbb4b56a3bbb1e2ca59c792ad0932e1af (patch) | |
| tree | 904b7bd2fe90fb522704d45ba0c7843b3a07076d /puppet/modules | |
| parent | 27ea07ce272a750441b10195a34d37ffa7e902fb (diff) | |
Update the setup of the network test server
+ update expired repo key for puppetlabs
+ use old-releases.ubuntu.com, as the only location still having 10.04
+ update instructions: script only runs with bash, not sh
+ update puppetlabs repo to install package from 12.04 even for 10.04,
as the latter no longer exists online
+ the previous step installs puppet v3.8 instead of v2.7, so minor updates
to the policy were needed too
+ update dante-server package URL to point to different repo, because the
previous did not include amd64 package.
Change-Id: Ie00be1aa393ca5607029e7694353f12e780f7beb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/apt_backports/manifests/init.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/network_test_server/manifests/linux/danted.pp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/puppet/modules/apt_backports/manifests/init.pp b/puppet/modules/apt_backports/manifests/init.pp index 31b6cde..7752bc8 100644 --- a/puppet/modules/apt_backports/manifests/init.pp +++ b/puppet/modules/apt_backports/manifests/init.pp @@ -1,6 +1,6 @@ class apt_backports( $base_url = $::operatingsystem ? { - Ubuntu => "http://archive.ubuntu.com/ubuntu", + Ubuntu => "http://old-releases.ubuntu.com/ubuntu", Debian => "http://backports.debian.org/debian-backports", }, $sections = $::operatingsystem ? { diff --git a/puppet/modules/network_test_server/manifests/linux/danted.pp b/puppet/modules/network_test_server/manifests/linux/danted.pp index b9aa037..de89e62 100644 --- a/puppet/modules/network_test_server/manifests/linux/danted.pp +++ b/puppet/modules/network_test_server/manifests/linux/danted.pp @@ -7,13 +7,14 @@ class network_test_server::linux::danted { # old version too, but the tests should really be fixed. $dante_deb = $architecture ? { i386 => 'dante-server_1.1.14-2_i386.deb', - x86_64 => 'dante-server_1.1.14-2_ia64.deb', - default => err("architecture $architecture is not supported!"), + x86_64 => 'dante-server_1.1.14-2_amd64.deb', + amd64 => 'dante-server_1.1.14-2_amd64.deb', + default => "architecture $architecture is not supported!", } exec { "fetch old dante-server": creates => "/tmp/$dante_deb", - command => "/usr/bin/wget -O /tmp/$dante_deb http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/d/dante/$dante_deb", + command => "/usr/bin/wget -O /tmp/$dante_deb http://old-releases.ubuntu.com/ubuntu/pool/universe/d/dante/$dante_deb", } package { "dante-server": |