From 4deddced0d707b72737c3d7f76855911e9506565 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 8 Feb 2019 12:03:13 -0800
Subject: [PATCH] Fix use of old site_logs secerts

The site_logs secret moved into opendev/basejobs and we renamed the
site_logs secret here into site_logs_project_config and site_specs.
Unfortauntely many of our playbooks in this repo were not updated to use
the new secret name so they cause some jobs to fail.

Fix this by updated the playbooks to use site_logs_project_config and
site_specs as appropriate.

Change-Id: I852a6362c35dd6aa17b0f767fceea811402dd90c
---
 playbooks/base-minimal/post-logs.yaml       | 4 ++--
 playbooks/base-ozj/post-logs.yaml           | 4 ++--
 playbooks/base-test/post-logs.yaml          | 4 ++--
 playbooks/publish/openstack-specs-site.yaml | 4 ++--
 playbooks/publish/openstack-specs.yaml      | 4 ++--
 playbooks/publish/service-types.yaml        | 4 ++--
 tests/vars.yaml                             | 4 +++-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/playbooks/base-minimal/post-logs.yaml b/playbooks/base-minimal/post-logs.yaml
index ff39881fb1..7721b8e32a 100644
--- a/playbooks/base-minimal/post-logs.yaml
+++ b/playbooks/base-minimal/post-logs.yaml
@@ -1,10 +1,10 @@
 - hosts: localhost
   roles:
     - role: add-fileserver
-      fileserver: "{{ site_logs }}"
+      fileserver: "{{ site_logs_project_config }}"
     - role: ara-report
 
-- hosts: "{{ site_logs.fqdn }}"
+- hosts: "{{ site_logs_project_config.fqdn }}"
   roles:
     - role: upload-logs
       zuul_log_url: "http://logs.openstack.org"
diff --git a/playbooks/base-ozj/post-logs.yaml b/playbooks/base-ozj/post-logs.yaml
index ff39881fb1..7721b8e32a 100644
--- a/playbooks/base-ozj/post-logs.yaml
+++ b/playbooks/base-ozj/post-logs.yaml
@@ -1,10 +1,10 @@
 - hosts: localhost
   roles:
     - role: add-fileserver
-      fileserver: "{{ site_logs }}"
+      fileserver: "{{ site_logs_project_config }}"
     - role: ara-report
 
-- hosts: "{{ site_logs.fqdn }}"
+- hosts: "{{ site_logs_project_config.fqdn }}"
   roles:
     - role: upload-logs
       zuul_log_url: "http://logs.openstack.org"
diff --git a/playbooks/base-test/post-logs.yaml b/playbooks/base-test/post-logs.yaml
index ad044d79ff..fc5f7ff3ed 100644
--- a/playbooks/base-test/post-logs.yaml
+++ b/playbooks/base-test/post-logs.yaml
@@ -1,10 +1,10 @@
 - hosts: localhost
   roles:
     - role: add-fileserver
-      fileserver: "{{ site_logs }}"
+      fileserver: "{{ site_logs_project_config }}"
     - role: ara-report
 
-- hosts: "{{ site_logs.fqdn }}"
+- hosts: "{{ site_logs_project_config.fqdn }}"
   gather_facts: False
   roles:
     - role: test-upload-logs
diff --git a/playbooks/publish/openstack-specs-site.yaml b/playbooks/publish/openstack-specs-site.yaml
index 37aaeaafe5..a21b7de951 100644
--- a/playbooks/publish/openstack-specs-site.yaml
+++ b/playbooks/publish/openstack-specs-site.yaml
@@ -9,9 +9,9 @@
 - hosts: localhost
   roles:
     - role: add-fileserver
-      fileserver: "{{ site_logs }}"
+      fileserver: "{{ site_specs }}"
 
-- hosts: "{{ site_logs.fqdn }}"
+- hosts: "{{ site_specs.fqdn }}"
   gather_facts: False
   tasks:
     - name: Upload specs site to fileserver
diff --git a/playbooks/publish/openstack-specs.yaml b/playbooks/publish/openstack-specs.yaml
index 7a292b3adf..af71ca0667 100644
--- a/playbooks/publish/openstack-specs.yaml
+++ b/playbooks/publish/openstack-specs.yaml
@@ -8,9 +8,9 @@
 - hosts: localhost
   roles:
     - role: add-fileserver
-      fileserver: "{{ site_logs }}"
+      fileserver: "{{ site_specs }}"
 
-- hosts: "{{ site_logs.fqdn }}"
+- hosts: "{{ site_specs.fqdn }}"
   gather_facts: False
   tasks:
 
diff --git a/playbooks/publish/service-types.yaml b/playbooks/publish/service-types.yaml
index 47cf15bcd7..7fef919439 100644
--- a/playbooks/publish/service-types.yaml
+++ b/playbooks/publish/service-types.yaml
@@ -9,9 +9,9 @@
 - hosts: localhost
   roles:
     - role: add-fileserver
-      fileserver: "{{ site_logs }}"
+      fileserver: "{{ site_specs }}"
 
-- hosts: "{{ site_logs.fqdn }}"
+- hosts: "{{ site_specs.fqdn }}"
   gather_facts: False
   tasks:
     - name: Publish service-types-authority data to service-types.openstack.org
diff --git a/tests/vars.yaml b/tests/vars.yaml
index 8688f1204a..fa802f5655 100644
--- a/tests/vars.yaml
+++ b/tests/vars.yaml
@@ -1,4 +1,6 @@
-site_logs:
+site_logs_project_config:
+  fqdn: fake
+site_specs:
   fqdn: fake
 site_zuulv3_dev:
   fqdn: fake