From 7b5c476ecd2e6d3cf26bea294e5b7c141d061384 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Fri, 30 Jun 2017 15:02:39 -0400
Subject: Changing the passing of data for sc creation.
---
.../openshift_default_storage_class/defaults/main.yml | 1 +
roles/openshift_default_storage_class/tasks/main.yml | 19 ++++++++-----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/roles/openshift_default_storage_class/defaults/main.yml b/roles/openshift_default_storage_class/defaults/main.yml
index 4bdc1dd6e..42e8e8018 100644
--- a/roles/openshift_default_storage_class/defaults/main.yml
+++ b/roles/openshift_default_storage_class/defaults/main.yml
@@ -5,6 +5,7 @@ openshift_storageclass_defaults:
provisioner: kubernetes.io/aws-ebs
parameters:
type: gp2
+ encrypted: "false"
gce:
name: standard
provisioner: kubernetes.io/gce-pd
diff --git a/roles/openshift_default_storage_class/tasks/main.yml b/roles/openshift_default_storage_class/tasks/main.yml
index 49b0f1dda..b6f97280a 100644
--- a/roles/openshift_default_storage_class/tasks/main.yml
+++ b/roles/openshift_default_storage_class/tasks/main.yml
@@ -1,18 +1,15 @@
---
# Install default storage classes in GCE & AWS
+- name: storageclass template
+ template:
+ src: storageclass.j2
+ dest: /tmp/storageclass
+ run_once: true
+
- name: Ensure storageclass object
oc_obj:
kind: storageclass
name: "{{ openshift_storageclass_name }}"
- content:
- path: /tmp/openshift_storageclass
- data:
- kind: StorageClass
- apiVersion: storage.k8s.io/v1
- metadata:
- name: "{{ openshift_storageclass_name }}"
- annotations:
- storageclass.beta.kubernetes.io/is-default-class: "true"
- provisioner: "{{ openshift_storageclass_provisioner }}"
- parameters: "{{ openshift_storageclass_parameters }}"
+ files:
+ - /tmp/storageclass
run_once: true
--
cgit v1.2.3