From f070f7380baa11aa3c04a78abdf2cbd8a2bae55f Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 18 2020 20:04:18 +0000
Subject: Merge branch 'cboltz-chameleon-2.0' into 'production'


static.o.o: add chameleon-2.0 submodule

See merge request infra/salt!382
---

diff --git a/pillar/role/static_master.sls b/pillar/role/static_master.sls
index fdc5a7f..b59600e 100644
--- a/pillar/role/static_master.sls
+++ b/pillar/role/static_master.sls
@@ -8,7 +8,7 @@ profile:
     expected_gitmodules:
       # expected .gitmodules files and their sha256sum
       # this ensures we notice .gitmodules changes and can update the salt code accordingly
-      ./static.opensuse.org/.gitmodules: 19479ebe1afda2dd4ba774f572546ef6c549822c0ebd4983b644bf4ea8183930
+      ./static.opensuse.org/.gitmodules: 5d97f0f6b006e16ba39223d7c67c79aad47458f2f3c3408c9d42c503d21fd043
       ./static.opensuse.org/hosts/www.o.o/.gitmodules: e2da74eed7fcfed7f08669f6bff9d89e0d5f2f02ee8f2c6ad43afe4996cc57f1
     git_repos:
       # branch defaults to 'master' if not specified
@@ -29,7 +29,10 @@ profile:
       static.opensuse.org/themes:
         repo: https://github.com/openSUSE/opensuse-themes
       static.opensuse.org/chameleon:
-        repo: https://github.com/openSUSE/opensuse-theme-chameleon
+        repo: https://github.com/openSUSE/chameleon.git
+      static.opensuse.org/chameleon-2.0:
+        branch: rel-2.0
+        repo: https://github.com/openSUSE/chameleon.git
       static.opensuse.org/hosts/www.o.o/searchPage:
         branch: gh-pages
         repo: https://github.com/opensuse/searchPage.git
diff --git a/salt/profile/static/master.sls b/salt/profile/static/master.sls
index 013ffed..d1b8acb 100644
--- a/salt/profile/static/master.sls
+++ b/salt/profile/static/master.sls
@@ -48,7 +48,7 @@ static_master_cron_mailto:
 
 # clone git repos
 {% for dir, data in git_repos.items() %}
-{{ data.repo }}:
+{{ data.repo }}-{{ data.get('branch', 'master') }}:
   # salt 2018.3.3 introduced git.cloned - switch once our salt is new enough
   git.latest:
     - branch: {{ data.get('branch', 'master') }}