From 1fab67de2c707320bae8a27f019d2151d066c986 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 28 Jul 2016 11:27:18 -0400 Subject: [PATCH] Clean up puppet-apply testing on precise We've upgraded from precise to trusty on series of hosts, but forgot to update site.pp. This patch moves zuul, static, paste and proposal.slave to run tests on ubuntu-trusty. Change-Id: Iba041533ea86c3b01f981069b53fc7a1781521b1 Signed-off-by: Paul Belanger --- manifests/site.pp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 1a46d5c7c0..2ea175332a 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -273,7 +273,7 @@ node 'lists.openstack.org' { } } -# Node-OS: precise +# Node-OS: trusty node 'paste.openstack.org' { class { 'openstack_project::server': iptables_public_tcp_ports => [80], @@ -635,7 +635,7 @@ node 'storyboard-dev.openstack.org' { } # A machine to serve static content. -# Node-OS: precise +# Node-OS: trusty node 'static.openstack.org' { class { 'openstack_project::server': iptables_public_tcp_ports => [22, 80, 443], @@ -741,7 +741,6 @@ node 'nodepool.openstack.org' { } } -# Node-OS: precise # Node-OS: trusty node 'zuul.openstack.org' { class { 'openstack_project::zuul_prod': @@ -893,7 +892,6 @@ node /^ci-backup-.*\.openstack\.org$/ { include openstack_project::backup_server } -# Node-OS: precise # Node-OS: trusty node 'proposal.slave.openstack.org' { include openstack_project