From fbd37cf0cb4b6bb01bb612c2deee2b2433923448 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 11 Dec 2017 14:27:36 +1100 Subject: [PATCH] status.o.o xenial upgrade Convert puppet for status01.o.o which will be a xenial host. status.o.o will be redirected. Change-Id: Iec638a06e7578d6d8ad2bdc5daf2ef5abba6607f --- hiera/common.yaml | 2 +- manifests/site.pp | 5 ++++- modules/openstack_project/files/puppetmaster/groups.txt | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hiera/common.yaml b/hiera/common.yaml index d1e7fc41fc..8e2a8a0d15 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -470,7 +470,7 @@ cacti_hosts: - review.openstack.org - stackalytics.openstack.org - static.openstack.org -- status.openstack.org +- status01.openstack.org - storyboard.openstack.org - subunit-worker02.openstack.org - translate.openstack.org diff --git a/manifests/site.pp b/manifests/site.pp index c6b313740b..5aaac1d73f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -841,7 +841,10 @@ node /^zk\d+\.openstack\.org$/ { # A machine to serve various project status updates. # Node-OS: trusty -node 'status.openstack.org' { +# Node-OS: xenial +node /^status\d*\.openstack\.org$/ { + $group = 'status' + class { 'openstack_project::server': iptables_public_tcp_ports => [22, 80, 443], sysadmins => hiera('sysadmins', []), diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt index b9e876b335..799b070bfc 100644 --- a/modules/openstack_project/files/puppetmaster/groups.txt +++ b/modules/openstack_project/files/puppetmaster/groups.txt @@ -20,3 +20,4 @@ wiki-dev ~wiki-dev\d+\.openstack\.org zuul-merger ~z[lm](static)?\d+\.openstack\.org zuul-executor ~ze\d+\.openstack\.org grafana ~grafana\d*\.openstack\.org +status ~status\d*\.openstack\.org