From f65b0d0b0363c02e7d44cd145eb9f4def85688b9 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 24 Oct 2016 17:15:20 -0700
Subject: [PATCH] openqa: drop prod/stg variance for fixed asset location

---
 inventory/group_vars/openqa-stg                          | 4 ----
 roles/openqa/server/defaults/main.yml                    | 1 -
 .../server/{templates/createhdds.j2 => files/createhdds} | 2 +-
 roles/openqa/server/tasks/main.yml                       | 9 ++-------
 4 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 roles/openqa/server/defaults/main.yml
 rename roles/openqa/server/{templates/createhdds.j2 => files/createhdds} (75%)

diff --git a/inventory/group_vars/openqa-stg b/inventory/group_vars/openqa-stg
index 1cd973d9c7..4f62527782 100644
--- a/inventory/group_vars/openqa-stg
+++ b/inventory/group_vars/openqa-stg
@@ -28,10 +28,6 @@ openqa_dbuser: openqastg
 openqa_dbpassword: "{{ stg_openqa_dbpassword }}"
 openqa_assetsize: 300
 
-# this is a temporary variance between staging and prod while
-# testing https://github.com/os-autoinst/openQA/pull/945
-openqa_fixed: /var/lib/openqa/share/factory/hdd/fixed
-
 openqa_key: "{{ stg_openqa_apikey }}"
 openqa_secret: "{{ stg_openqa_apisecret }}"
 
diff --git a/roles/openqa/server/defaults/main.yml b/roles/openqa/server/defaults/main.yml
deleted file mode 100644
index 8003a1d58a..0000000000
--- a/roles/openqa/server/defaults/main.yml
+++ /dev/null
@@ -1 +0,0 @@
-openqa_fixed: /var/lib/openqa/share/factory/hdd
diff --git a/roles/openqa/server/templates/createhdds.j2 b/roles/openqa/server/files/createhdds
similarity index 75%
rename from roles/openqa/server/templates/createhdds.j2
rename to roles/openqa/server/files/createhdds
index 39724acbf6..c76019d8b6 100644
--- a/roles/openqa/server/templates/createhdds.j2
+++ b/roles/openqa/server/files/createhdds
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-cd {{ openqa_fixed }}
+cd /var/lib/openqa/share/factory/hdd/fixed
 LIBGUESTFS_BACKEND=direct withlock /var/lock/createhdds.lock /root/openqa_fedora_tools/tools/createhdds.py all --clean
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index 109c4c18ed..93a6b82187 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -16,11 +16,6 @@
 # - external_hostname
 ##       string - The public hostname for the server (will be used as ServerName)
 ##       default - ansible_nodename
-# - openqa_fixed
-##       string - location for fixed hdd assets; this varies depending on
-##                what openQA version is in use. This is a temporary thing
-##                while we're testing PR #945 on staging
-##       default - /var/lib/openqa/share/factory/hdd
 
 # Optional vars
 # - openqa_static_uid
@@ -138,12 +133,12 @@
   - /var/lib/openqa/share/factory/other
 
 - name: Set up createhdds cron job
-  template: src=createhdds.j2 dest=/etc/cron.daily/createhdds owner=root group=root mode=0755
+  copy: src=createhdds dest=/etc/cron.daily/createhdds owner=root group=root mode=0755
 
 - name: Check if any hard disk images need (re)building
   command: "/root/openqa_fedora_tools/tools/createhdds.py check"
   args:
-    chdir: "{{ openqa_fixed }}"
+    chdir: /var/lib/openqa/share/factory/hdd/fixed
   register: diskcheck
   failed_when: "1 != 1"
   changed_when: "1 != 1"