From 42d330a1cf2990fee39dab36250524ebfb303428 Mon Sep 17 00:00:00 2001
From: Tim Bielawa <tbielawa@redhat.com>
Date: Wed, 6 Sep 2017 15:11:55 -0400
Subject: CFME 4.6 work begins. CFME 4.5 references added to the release-3.6
 branch

---
 roles/openshift_cfme/templates/miq-pv-db.yaml.j2     | 13 -------------
 roles/openshift_cfme/templates/miq-pv-region.yaml.j2 | 13 -------------
 roles/openshift_cfme/templates/miq-pv-server.yaml.j2 | 13 -------------
 3 files changed, 39 deletions(-)
 delete mode 100644 roles/openshift_cfme/templates/miq-pv-db.yaml.j2
 delete mode 100644 roles/openshift_cfme/templates/miq-pv-region.yaml.j2
 delete mode 100644 roles/openshift_cfme/templates/miq-pv-server.yaml.j2

(limited to 'roles/openshift_cfme/templates')

diff --git a/roles/openshift_cfme/templates/miq-pv-db.yaml.j2 b/roles/openshift_cfme/templates/miq-pv-db.yaml.j2
deleted file mode 100644
index 280f3e97a..000000000
--- a/roles/openshift_cfme/templates/miq-pv-db.yaml.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: miq-pv01
-spec:
-  capacity:
-    storage: 15Gi
-  accessModes:
-    - ReadWriteOnce
-  nfs: 
-    path: {{ openshift_cfme_nfs_directory }}/miq-pv01
-    server: {{ openshift_cfme_nfs_server }}
-  persistentVolumeReclaimPolicy: Retain
diff --git a/roles/openshift_cfme/templates/miq-pv-region.yaml.j2 b/roles/openshift_cfme/templates/miq-pv-region.yaml.j2
deleted file mode 100644
index fe80dffa5..000000000
--- a/roles/openshift_cfme/templates/miq-pv-region.yaml.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: miq-pv02
-spec:
-  capacity:
-    storage: 5Gi
-  accessModes:
-    - ReadWriteOnce
-  nfs: 
-    path: {{ openshift_cfme_nfs_directory }}/miq-pv02
-    server: {{ openshift_cfme_nfs_server }}
-  persistentVolumeReclaimPolicy: Retain
diff --git a/roles/openshift_cfme/templates/miq-pv-server.yaml.j2 b/roles/openshift_cfme/templates/miq-pv-server.yaml.j2
deleted file mode 100644
index f84b67ea9..000000000
--- a/roles/openshift_cfme/templates/miq-pv-server.yaml.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: miq-pv03
-spec:
-  capacity:
-    storage: 5Gi
-  accessModes:
-    - ReadWriteOnce
-  nfs: 
-    path: {{ openshift_cfme_nfs_directory }}/miq-pv03
-    server: {{ openshift_cfme_nfs_server }}
-  persistentVolumeReclaimPolicy: Retain
-- 
cgit v1.2.3


From 8e10c53974b4b87e483ed0dfec3946383aa071c7 Mon Sep 17 00:00:00 2001
From: Tim Bielawa <tbielawa@redhat.com>
Date: Fri, 15 Sep 2017 17:18:22 -0400
Subject: Import upstream templates. Do the work. Validate parameters.

---
 .../templates/openshift_cfme-miq-template-ext-db.exports.j2             | 1 +
 roles/openshift_cfme/templates/openshift_cfme-miq-template.exports.j2   | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 roles/openshift_cfme/templates/openshift_cfme-miq-template-ext-db.exports.j2
 create mode 100644 roles/openshift_cfme/templates/openshift_cfme-miq-template.exports.j2

(limited to 'roles/openshift_cfme/templates')

diff --git a/roles/openshift_cfme/templates/openshift_cfme-miq-template-ext-db.exports.j2 b/roles/openshift_cfme/templates/openshift_cfme-miq-template-ext-db.exports.j2
new file mode 100644
index 000000000..f43a93ba0
--- /dev/null
+++ b/roles/openshift_cfme/templates/openshift_cfme-miq-template-ext-db.exports.j2
@@ -0,0 +1 @@
+{{ openshift_cfme_storage_nfs_base_dir }}/{{ openshift_cfme_flavor_short }}-app *(rw,no_root_squash,no_wdelay)
diff --git a/roles/openshift_cfme/templates/openshift_cfme-miq-template.exports.j2 b/roles/openshift_cfme/templates/openshift_cfme-miq-template.exports.j2
new file mode 100644
index 000000000..4a4d85a23
--- /dev/null
+++ b/roles/openshift_cfme/templates/openshift_cfme-miq-template.exports.j2
@@ -0,0 +1,2 @@
+{{ openshift_cfme_storage_nfs_base_dir }}/{{ openshift_cfme_flavor_short }}-app *(rw,no_root_squash,no_wdelay)
+{{ openshift_cfme_storage_nfs_base_dir }}/{{ openshift_cfme_flavor_short }}-db *(rw,no_root_squash,no_wdelay)
-- 
cgit v1.2.3