From 40ca92ee871bae3b0c95f0eef7ac17a8d409b18a Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 12 2020 11:45:00 +0000
Subject: Merge branch 'cboltz-kill-git-formula' into 'production'


get rid of git-formula

See merge request infra/salt!357
---

diff --git a/pillar/FORMULAS.yaml b/pillar/FORMULAS.yaml
index a63fa27..533c938 100644
--- a/pillar/FORMULAS.yaml
+++ b/pillar/FORMULAS.yaml
@@ -2,7 +2,6 @@
 chrony: {}
 elasticsearch: {}
 firewalld: {}
-git: {}
 grains:
   namespace: 'tampakrap'
 keepalived: {}
diff --git a/pillar/role/saltmaster.sls b/pillar/role/saltmaster.sls
index efeb778..d21de4c 100644
--- a/pillar/role/saltmaster.sls
+++ b/pillar/role/saltmaster.sls
@@ -4,10 +4,8 @@ include:
 {% endif %}
 
 salt:
-  gitfs:
-    pygit2:
-      git:
-        require_state: git
+  # salt on 15.1 uses py3, therefore different package name
+  pygit2: python3-pygit2
   master:
     cli_summary: True
     default_top: production
diff --git a/salt/profile/gitlab_runner/init.sls b/salt/profile/gitlab_runner/init.sls
index 0adf664..43bb6f1 100644
--- a/salt/profile/gitlab_runner/init.sls
+++ b/salt/profile/gitlab_runner/init.sls
@@ -1,5 +1,7 @@
-include:
-  - git
+gitlab_runner_packages:
+  pkg.installed:
+    - pkgs:
+      - git
 
 gitlab_runner:
   pkg.installed: