From e836fb7af6c74c98e9353ad51c354ca444d6723f Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 1 Mar 2019 21:38:51 +0000
Subject: [PATCH] Remember that lookups are local

Go ahead and actually clone project-config on bridge, because
we're going to read the projects.yaml file with a lookup. Because
it's a local action, not a remote action.

Change-Id: I77454bcb10b797ce5b48018caef7fecb31947b97
---
 playbooks/remote_puppet_git.yaml                   | 5 ++---
 playbooks/roles/gitea-git-repos/defaults/main.yaml | 2 --
 playbooks/roles/gitea-git-repos/tasks/main.yaml    | 7 +------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index a05e2f6286..e40ff31795 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -3,12 +3,11 @@
   strategy: free
   connection: local
   tasks:
-    # Note that git module does ls-remote if clone is set to no and places
-    # the remote_head value in returndict.after
     - name: Grab project-config repo info
       git:
         repo: https://git.openstack.org/openstack-infra/project-config
-        clone: no
+        dest: /opt/project-config
+        force: yes
       register: gitinfo
 
 - hosts: "git-server:!disabled"
diff --git a/playbooks/roles/gitea-git-repos/defaults/main.yaml b/playbooks/roles/gitea-git-repos/defaults/main.yaml
index ede9e69f56..0792a5e595 100644
--- a/playbooks/roles/gitea-git-repos/defaults/main.yaml
+++ b/playbooks/roles/gitea-git-repos/defaults/main.yaml
@@ -1,3 +1 @@
 gitea_url: https://localhost:3000
-project_config_ref: master
-project_config_dest: /opt/project_config
diff --git a/playbooks/roles/gitea-git-repos/tasks/main.yaml b/playbooks/roles/gitea-git-repos/tasks/main.yaml
index e052afae65..b9c71bca2b 100644
--- a/playbooks/roles/gitea-git-repos/tasks/main.yaml
+++ b/playbooks/roles/gitea-git-repos/tasks/main.yaml
@@ -1,11 +1,6 @@
-- name: Clone project-config
-  git:
-    repo: https://git.openstack.org/openstack-infra/project-config
-    dest: "{{ project_config_dest }}"
-    version: "{{ project_config_ref }}"
 - name: Get Gerrit project list
   set_fact:
-    gerrit_projects: "{{ lookup('file', project_config_dest + '/gerrit/projects.yaml') | from_yaml }}"
+    gerrit_projects: "{{ lookup('file', '/opt/project-config/gerrit/projects.yaml') | from_yaml }}"
 - name: Parse Gerrit org list
   set_fact:
     gerrit_orgs: "{{ gerrit_projects | map(attribute='project') | map('regex_search', '^(.*?)/') | list | unique | select | map('regex_replace', '/', '') | list }}"