From 3efd5ed70da55682c9f4816969603c59723b3eb6 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Apr 24 2020 19:34:25 +0000
Subject: ostree migration: move ostree to a new volume off fedora_koji


Signed-off-by: Kevin Fenzi <kevin@scrye.com>

---

diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml
index 9305d40..cc8dca9 100644
--- a/playbooks/groups/bodhi-backend.yml
+++ b/playbooks/groups/bodhi-backend.yml
@@ -38,6 +38,26 @@
     mnt_dir: '/mnt/fedora_koji'
     nfs_src_dir: 'fedora_koji'
 
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/ostree'
+    nfs_src_dir: 'fedora-ostree-content/ostree'
+    when: env != 'staging'
+
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/compose/ostree'
+    nfs_src_dir: 'fedora-ostree-content/compose/ostree'
+    when: env != 'staging'
+
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/ostree'
+    nfs_src_dir: 'fedora-ostree-content-stg/ostree'
+    when: env == 'staging'
+
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/compose/ostree'
+    nfs_src_dir: 'fedora-ostree-content-stg/compose/ostree'
+    when: env == 'staging'
+
     # In staging, we mount fedora_koji as read only (see nfs_mount_opts)
   - role: nfs/client
     mnt_dir: '/mnt/fedora_koji_prod'
diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index eb77006..3df9732 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -17,6 +17,26 @@
   roles:
   - base
   - { role: nfs/client, mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: "{{ koji_hub_nfs }}", when: koji_hub_nfs is defined }
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/ostree'
+    nfs_src_dir: 'fedora-ostree-content/ostree'
+    when: env != 'staging' and 'runroot' in group_names
+
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/compose/ostree'
+    nfs_src_dir: 'fedora-ostree-content/compose/ostree'
+    when: env != 'staging' and 'runroot' in group_names
+
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/ostree'
+    nfs_src_dir: 'fedora-ostree-content-stg/ostree'
+    when: env == 'staging' and 'runroot' in group_names
+
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/compose/ostree'
+    nfs_src_dir: 'fedora-ostree-content-stg/compose/ostree'
+    when: env == 'staging' and 'runroot' in group_names
+
   - koji_builder
   - { role: bkernel, when: inventory_hostname.startswith('bkernel') }
   - hosts
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index d50dff8..17664c5 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -28,6 +28,26 @@
         nfs_src_dir: "{{ koji_hub_nfs }}",
         when: "env == 'staging' or createrepo",
       }
+    - role: nfs/client
+      mnt_dir: '/mnt/koji/ostree'
+      nfs_src_dir: 'fedora-ostree-content/ostree'
+      when: env != 'staging' and 'runroot' in group_names
+
+    - role: nfs/client
+      mnt_dir: '/mnt/koji/compose/ostree'
+      nfs_src_dir: 'fedora-ostree-content/compose/ostree'
+      when: env != 'staging' and 'runroot' in group_names
+
+    - role: nfs/client
+      mnt_dir: '/mnt/koji/ostree'
+      nfs_src_dir: 'fedora-ostree-content-stg/ostree'
+      when: env == 'staging' and 'runroot' in group_names
+
+    - role: nfs/client
+      mnt_dir: '/mnt/koji/compose/ostree'
+      nfs_src_dir: 'fedora-ostree-content-stg/compose/ostree'
+      when: env == 'staging' and 'runroot' in group_names
+
     - { role: fas_client, when: not inventory_hostname.startswith('bkernel') }
     - { role: sudo, when: not inventory_hostname.startswith('bkernel') }
     - koji_builder
diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index 8922004..f573bed 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -91,12 +91,12 @@
     nfs_src_dir: 'fedora_koji'
     when: env == 'staging' and inventory_hostname.startswith('koji')
   - role: nfs/client
-    mnt_dir: '/mnt/koji/ostree-new'
+    mnt_dir: '/mnt/koji/ostree'
     nfs_src_dir: 'fedora-ostree-content/ostree'
     mount_stg: true
     when: env != 'staging'
   - role: nfs/client
-    mnt_dir: '/mnt/koji/compose/ostree-new'
+    mnt_dir: '/mnt/koji/compose/ostree'
     mount_stg: true
     nfs_src_dir: 'fedora-ostree-content/compose/ostree'
     when: env != 'staging'
diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml
index 62f66a3..4b99e8d 100644
--- a/playbooks/groups/kojipkgs.yml
+++ b/playbooks/groups/kojipkgs.yml
@@ -49,6 +49,14 @@
   - role: nfs/client
     mnt_dir: '/pub'
     nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub'
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/ostree'
+    nfs_src_dir: 'fedora-ostree-content/ostree'
+    mount_stg: true
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/compose/ostree'
+    mount_stg: true
+    nfs_src_dir: 'fedora-ostree-content/compose/ostree'
   - role: kojipkgs
   - role: varnish
 
diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml
index 584cb1c..6e69d07 100644
--- a/playbooks/groups/releng-compose.yml
+++ b/playbooks/groups/releng-compose.yml
@@ -51,6 +51,23 @@
     mnt_dir: '/mnt/fedora_koji'
     nfs_src_dir: "{{ koji_hub_nfs }}"
     when: "'releng_stg' not in group_names"
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/ostree'
+    nfs_src_dir: 'fedora-ostree-content/ostree'
+    when: "'releng_stg' not in group_names"
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/compose/ostree'
+    nfs_src_dir: 'fedora-ostree-content/compose/ostree'
+    when: "'releng_stg' not in group_names"
+
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/ostree'
+    nfs_src_dir: 'fedora-ostree-content-stg/ostree'
+    when: "'releng_stg' in group_names"
+  - role: nfs/client
+    mnt_dir: '/mnt/koji/compose/ostree'
+    nfs_src_dir: 'fedora-ostree-content-stg/compose/ostree'
+    when: "'releng_stg' in group_names"
 
   - role: nfs/client
     mnt_dir: '/pub'