summaryrefslogtreecommitdiffstats
path: root/anslib/patches
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-02-16 20:54:52 +0100
committerSuren A. Chilingaryan <csa@suren.me>2018-02-16 20:54:52 +0100
commit96ced00e05b50f276841a9212ae89e018de4d92d (patch)
treeb86c75fa97326dc89cc37c6dd23d294bd13eb56a /anslib/patches
parentcd94e324d3401e518578d91382a2b7ee67562112 (diff)
downloadands-96ced00e05b50f276841a9212ae89e018de4d92d.tar.gz
ands-96ced00e05b50f276841a9212ae89e018de4d92d.tar.bz2
ands-96ced00e05b50f276841a9212ae89e018de4d92d.tar.xz
ands-96ced00e05b50f276841a9212ae89e018de4d92d.zip
Updated to OpenShift 3.7 and tested
Diffstat (limited to 'anslib/patches')
-rw-r--r--anslib/patches/ansible_broker-ds-sc.patch10
-rw-r--r--anslib/patches/glusterfs-ds-mountrun.patch25
-rw-r--r--anslib/patches/template_broker-ds-badcheck.patch23
3 files changed, 58 insertions, 0 deletions
diff --git a/anslib/patches/ansible_broker-ds-sc.patch b/anslib/patches/ansible_broker-ds-sc.patch
new file mode 100644
index 0000000..9f99056
--- /dev/null
+++ b/anslib/patches/ansible_broker-ds-sc.patch
@@ -0,0 +1,10 @@
+--- 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/anslib/patches/glusterfs-ds-mountrun.patch b/anslib/patches/glusterfs-ds-mountrun.patch
new file mode 100644
index 0000000..02f7e15
--- /dev/null
+++ b/anslib/patches/glusterfs-ds-mountrun.patch
@@ -0,0 +1,25 @@
+--- 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-socket
++# mountPath: "/run/glusterd.socket"
+ - 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-socket
++# hostPath:
++# path: "/run/glusterd.socket"
+ - name: glusterfs-lvm
+ hostPath:
+ path: "/run/lvm"
diff --git a/anslib/patches/template_broker-ds-badcheck.patch b/anslib/patches/template_broker-ds-badcheck.patch
new file mode 100644
index 0000000..477ec66
--- /dev/null
+++ b/anslib/patches/template_broker-ds-badcheck.patch
@@ -0,0 +1,23 @@
+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 }}"