From aa94f2d831c355e88cb3b6c98a7f1db44792d3b1 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 19 Mar 2021 14:55:02 +1100
Subject: [PATCH] Rename refstack group variables

When we cleaned up the puppet in
I6b6dfd0f8ef89a5362f64cfbc8016ba5b1a346b3 we renamed the group
s/refstack-docker/refstack/ but didn't move the variables and some
other references too.

Change-Id: Ib07d1e9ede628c43b4d5d94b64ec35c101e11be8
---
 .../group_vars/{refstack-docker.yaml => refstack.yaml}        | 0
 playbooks/zuul/run-base.yaml                                  | 2 +-
 .../group_vars/{refstack-docker.yaml.j2 => refstack.yaml.j2}  | 0
 zuul.d/system-config-run.yaml                                 | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename inventory/service/group_vars/{refstack-docker.yaml => refstack.yaml} (100%)
 rename playbooks/zuul/templates/group_vars/{refstack-docker.yaml.j2 => refstack.yaml.j2} (100%)

diff --git a/inventory/service/group_vars/refstack-docker.yaml b/inventory/service/group_vars/refstack.yaml
similarity index 100%
rename from inventory/service/group_vars/refstack-docker.yaml
rename to inventory/service/group_vars/refstack.yaml
diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml
index 319361fb30..4ee2c25286 100644
--- a/playbooks/zuul/run-base.yaml
+++ b/playbooks/zuul/run-base.yaml
@@ -63,7 +63,7 @@
         - group_vars/meetpad.yaml
         - group_vars/jvb.yaml
         - group_vars/nodepool-launcher.yaml
-        - group_vars/refstack-docker.yaml
+        - group_vars/refstack.yaml
         - group_vars/registry.yaml
         - group_vars/review.yaml
         - group_vars/control-plane-clouds.yaml
diff --git a/playbooks/zuul/templates/group_vars/refstack-docker.yaml.j2 b/playbooks/zuul/templates/group_vars/refstack.yaml.j2
similarity index 100%
rename from playbooks/zuul/templates/group_vars/refstack-docker.yaml.j2
rename to playbooks/zuul/templates/group_vars/refstack.yaml.j2
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 8004e1ac83..d41657b2a8 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -911,8 +911,8 @@
       container_command: docker
     files:
       - playbooks/bridge.yaml
-      - inventory/service/group-vars/refstack-docker.yaml
-      - playbooks/zuul/templates/group_vars/refstack-docker.yaml.j2
+      - inventory/service/group-vars/refstack.yaml
+      - playbooks/zuul/templates/group_vars/refstack.yaml.j2
       - playbooks/roles/refstack/
       - playbooks/roles/letsencrypt-create-certs/handlers/restart_apache.yaml
       - testinfra/test_refstack.py