Merge "Rename refstack group variables"

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

zuul.d/system-config-run.yaml

@@ -913,8 +913,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