From ad197a1766c093341845987bc30dbf12c2f3233a Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Mar 18 2020 20:53:01 +0000 Subject: Merge branch 'hellcp/deprecate-lizards' into production See merge request infra/salt!358 (manually merged on the commandline because the CI is currently broken) --- diff --git a/pillar/role/static_master.sls b/pillar/role/static_master.sls index 96ebc12..fdc5a7f 100644 --- a/pillar/role/static_master.sls +++ b/pillar/role/static_master.sls @@ -35,6 +35,8 @@ profile: repo: https://github.com/opensuse/searchPage.git studioexpress.opensuse.org: repo: https://github.com/openSUSE/studioexpress-landing.git + lizards.opensuse.org: + repo: https://github.com/openSUSE/lizards.git server_list: - narwal5.infra.opensuse.org - narwal6.infra.opensuse.org diff --git a/pillar/role/web_static.sls b/pillar/role/web_static.sls index 12b5a10..e301728 100644 --- a/pillar/role/web_static.sls +++ b/pillar/role/web_static.sls @@ -1,4 +1,4 @@ -{% set websites = ['html5test', 'people', 'shop', 'static', 'studioexpress'] %} +{% set websites = ['html5test', 'people', 'shop', 'static', 'studioexpress', 'lizards'] %} include: - role.common.nginx