From 5114b3c38ce2ed1af60820309129254f1687e764 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 9 Jan 2019 20:15:21 +0000 Subject: [PATCH] Add storyboard-dev01.opendev.org to inventory This is the Xenial replacement for the old Trusty-based storyboard-dev.openstack.org server. The existing manifest assumed $::fqdn for several class variables, so explicitly set the vhost name we want to use there, as it will become a CNAME alias to the new server. Change-Id: Ie18125a361165ed2354397bdac206ee4f88a0626 --- inventory/openstack.yaml | 8 ++++++++ manifests/site.pp | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index d69ede3cf4..e7b71e75ec 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -848,6 +848,14 @@ all: private_v4: 10.209.4.179 public_v4: 162.209.77.161 public_v6: 2001:4800:7818:103:be76:4eff:fe06:905 + storyboard-dev01.opendev.org: + ansible_host: 2001:4800:7817:103:be76:4eff:fe04:93f6 + location: + cloud: openstackci-rax + region_name: DFW + private_v4: 10.208.163.115 + public_v4: 23.253.234.105 + public_v6: 2001:4800:7817:103:be76:4eff:fe04:93f6 storyboard-dev.openstack.org: ansible_host: 2001:4800:7815:102:be76:4eff:fe05:3f4c location: diff --git a/manifests/site.pp b/manifests/site.pp index f1c0933108..2b62331adb 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -597,13 +597,13 @@ node /^storyboard-dev\d*\.open.*\.org$/ { mysql_password => hiera('storyboard_db_password'), rabbitmq_user => hiera('storyboard_rabbit_user', 'username'), rabbitmq_password => hiera('storyboard_rabbit_password'), - hostname => $::fqdn, + hostname => 'storyboard-dev.openstack.org', valid_oauth_clients => [ - $::fqdn, + 'storyboard-dev.openstack.org', 'logs.openstack.org', ], cors_allowed_origins => [ - "https://${::fqdn}", + 'https://storyboard-dev.openstack.org', 'http://logs.openstack.org', ], sender_email_address => 'storyboard-dev@storyboard-dev.openstack.org',