summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-02-16 20:53:38 +0100
committerSuren A. Chilingaryan <csa@suren.me>2018-02-16 20:53:38 +0100
commitec3bc59ab20c4c21b7cfd27065c1a9b811bd9518 (patch)
tree7793532acdca3d97338bad51226d91642b4980fd
parent5160996a7bca9053720cd6230537f7acacaa2134 (diff)
downloadopenshift-ec3bc59ab20c4c21b7cfd27065c1a9b811bd9518.zip
openshift-ec3bc59ab20c4c21b7cfd27065c1a9b811bd9518.tar.gz
openshift-ec3bc59ab20c4c21b7cfd27065c1a9b811bd9518.tar.bz2
openshift-ec3bc59ab20c4c21b7cfd27065c1a9b811bd9518.tar.xz
Fixes for Ands
-rw-r--r--roles/ansible_service_broker/tasks/install.yml1
-rw-r--r--roles/openshift_storage_glusterfs/files/v3.7/glusterfs-template.yml9
-rw-r--r--roles/template_service_broker/tasks/install.yml13
3 files changed, 16 insertions, 7 deletions
diff --git a/roles/ansible_service_broker/tasks/install.yml b/roles/ansible_service_broker/tasks/install.yml
index f869b5f..90911da 100644
--- a/roles/ansible_service_broker/tasks/install.yml
+++ b/roles/ansible_service_broker/tasks/install.yml
@@ -211,6 +211,7 @@
access_modes:
- ReadWriteOnce
volume_capacity: 1G
+ storage_class_name: glusterfs-storage
- name: Search for existing Ansible Service Broker deployment config
oc_obj:
diff --git a/roles/openshift_storage_glusterfs/files/v3.7/glusterfs-template.yml b/roles/openshift_storage_glusterfs/files/v3.7/glusterfs-template.yml
index 09850a2..506b072 100644
--- a/roles/openshift_storage_glusterfs/files/v3.7/glusterfs-template.yml
+++ b/roles/openshift_storage_glusterfs/files/v3.7/glusterfs-template.yml
@@ -49,6 +49,8 @@ objects:
mountPath: "/var/lib/heketi"
- name: glusterfs-run
mountPath: "/run"
+ - name: glusterfs-ands
+ mountPath: "/mnt/ands/glusterfs"
- name: glusterfs-lvm
mountPath: "/run/lvm"
- name: glusterfs-etc
@@ -98,7 +100,12 @@ objects:
hostPath:
path: "/var/lib/heketi"
- name: glusterfs-run
- emptyDir: {}
+ hostPath:
+ path: "/run/glusterd"
+# emptyDir: {}
+ - name: glusterfs-ands
+ hostPath:
+ path: "/mnt/ands/glusterfs"
- name: glusterfs-lvm
hostPath:
path: "/run/lvm"
diff --git a/roles/template_service_broker/tasks/install.yml b/roles/template_service_broker/tasks/install.yml
index d674d24..1eff3bc 100644
--- a/roles/template_service_broker/tasks/install.yml
+++ b/roles/template_service_broker/tasks/install.yml
@@ -1,11 +1,12 @@
---
+#DS
# Fact setting
-- name: Ensure that Template Service Broker has nodes to run on
- fail:
- msg: |-
- No schedulable nodes found matching node selector for Template Service Broker - '{{ template_service_broker_selector }}'
- when:
- - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(template_service_broker_selector)
+#- name: Ensure that Template Service Broker has nodes to run on
+# fail:
+# msg: |-
+# No schedulable nodes found matching node selector for Template Service Broker - '{{ template_service_broker_selector }}'
+# when:
+# - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(template_service_broker_selector)
- name: Set default image variables based on openshift_deployment_type
include_vars: "{{ item }}"