summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--anslib/patches/ansible-ghetto-json-ds-dont-parse-numbers.patch27
-rw-r--r--anslib/patches/ansible-role-ntp-ds-replace-obsolete-constructs.patch13
-rw-r--r--anslib/patches/openshift/ansible_broker-ds-sc.patch (renamed from anslib/patches/ansible_broker-ds-sc.patch)0
-rw-r--r--anslib/patches/openshift/etcd-ds-rh1538446-openshift-undefined.patch (renamed from anslib/patches/etcd-ds-rh1538446-openshift-undefined.patch)0
-rw-r--r--anslib/patches/openshift/glusterfs-ds-mountrun.patch (renamed from anslib/patches/glusterfs-ds-mountrun.patch)0
-rw-r--r--anslib/patches/openshift/glusterfs-ds-use_cluster_local_for_heketi.patch (renamed from anslib/patches/glusterfs-ds-use_cluster_local_for_heketi.patch)0
-rw-r--r--anslib/patches/openshift/networkmanager-ds-use-openshift-interface.patch (renamed from anslib/patches/networkmanager-ds-use-openshift-interface.patch)0
-rw-r--r--anslib/patches/openshift/openshift-ds-allow-upgrade-to-371.patch (renamed from anslib/patches/openshift-ds-allow-upgrade-to-371.patch)0
-rw-r--r--anslib/patches/openshift/openshift-ds-update371.patch (renamed from anslib/patches/openshift-ds-update371.patch)0
-rw-r--r--anslib/patches/openshift/registry-ds-glusterfs-fixes.patch (renamed from anslib/patches/registry-ds-glusterfs-fixes.patch)0
-rw-r--r--anslib/patches/openshift/registry-ds-glusterfs-storageclass.patch (renamed from anslib/patches/registry-ds-glusterfs-storageclass.patch)0
-rw-r--r--anslib/patches/openshift/template_broker-ds-badcheck.patch (renamed from anslib/patches/template_broker-ds-badcheck.patch)0
12 files changed, 40 insertions, 0 deletions
diff --git a/anslib/patches/ansible-ghetto-json-ds-dont-parse-numbers.patch b/anslib/patches/ansible-ghetto-json-ds-dont-parse-numbers.patch
new file mode 100644
index 0000000..62069d3
--- /dev/null
+++ b/anslib/patches/ansible-ghetto-json-ds-dont-parse-numbers.patch
@@ -0,0 +1,27 @@
+diff --git a/ghetto_json b/ghetto_json
+index ebc3d51..ef936b9 100755
+--- a/ghetto_json
++++ b/ghetto_json
+@@ -35,14 +35,14 @@ def main(params_list):
+ del ref[last_part]
+ changed = True
+ else:
+- if target.isdigit():
+- target = int(target)
+- if target == 'null':
+- target = None
+- if target == 'false':
+- target = False
+- if target == 'true':
+- target = True
++# if target.isdigit():
++# target = int(target)
++# if target == 'null':
++# target = None
++# if target == 'false':
++# target = False
++# if target == 'true':
++# target = True
+ if last_part not in ref or ref[last_part] != target:
+ ref[last_part] = target
+ changed = True
diff --git a/anslib/patches/ansible-role-ntp-ds-replace-obsolete-constructs.patch b/anslib/patches/ansible-role-ntp-ds-replace-obsolete-constructs.patch
new file mode 100644
index 0000000..6ad99b9
--- /dev/null
+++ b/anslib/patches/ansible-role-ntp-ds-replace-obsolete-constructs.patch
@@ -0,0 +1,13 @@
+diff --git a/tasks/main.yml b/tasks/main.yml
+index afbf1c2..503f4b0 100644
+--- a/tasks/main.yml
++++ b/tasks/main.yml
+@@ -13,7 +13,7 @@
+ state: present
+ when: ansible_system == "Linux"
+
+-- include: clock-rhel-6.yml
++- include_tasks: clock-rhel-6.yml
+ when: ansible_os_family == 'RedHat' and ansible_distribution_version.split('.')[0] == '6'
+
+ - name: Set timezone
diff --git a/anslib/patches/ansible_broker-ds-sc.patch b/anslib/patches/openshift/ansible_broker-ds-sc.patch
index 9f99056..9f99056 100644
--- a/anslib/patches/ansible_broker-ds-sc.patch
+++ b/anslib/patches/openshift/ansible_broker-ds-sc.patch
diff --git a/anslib/patches/etcd-ds-rh1538446-openshift-undefined.patch b/anslib/patches/openshift/etcd-ds-rh1538446-openshift-undefined.patch
index 2301072..2301072 100644
--- a/anslib/patches/etcd-ds-rh1538446-openshift-undefined.patch
+++ b/anslib/patches/openshift/etcd-ds-rh1538446-openshift-undefined.patch
diff --git a/anslib/patches/glusterfs-ds-mountrun.patch b/anslib/patches/openshift/glusterfs-ds-mountrun.patch
index 02f7e15..02f7e15 100644
--- a/anslib/patches/glusterfs-ds-mountrun.patch
+++ b/anslib/patches/openshift/glusterfs-ds-mountrun.patch
diff --git a/anslib/patches/glusterfs-ds-use_cluster_local_for_heketi.patch b/anslib/patches/openshift/glusterfs-ds-use_cluster_local_for_heketi.patch
index 75a8a43..75a8a43 100644
--- a/anslib/patches/glusterfs-ds-use_cluster_local_for_heketi.patch
+++ b/anslib/patches/openshift/glusterfs-ds-use_cluster_local_for_heketi.patch
diff --git a/anslib/patches/networkmanager-ds-use-openshift-interface.patch b/anslib/patches/openshift/networkmanager-ds-use-openshift-interface.patch
index 687be8a..687be8a 100644
--- a/anslib/patches/networkmanager-ds-use-openshift-interface.patch
+++ b/anslib/patches/openshift/networkmanager-ds-use-openshift-interface.patch
diff --git a/anslib/patches/openshift-ds-allow-upgrade-to-371.patch b/anslib/patches/openshift/openshift-ds-allow-upgrade-to-371.patch
index 2bae14e..2bae14e 100644
--- a/anslib/patches/openshift-ds-allow-upgrade-to-371.patch
+++ b/anslib/patches/openshift/openshift-ds-allow-upgrade-to-371.patch
diff --git a/anslib/patches/openshift-ds-update371.patch b/anslib/patches/openshift/openshift-ds-update371.patch
index a6beff3..a6beff3 100644
--- a/anslib/patches/openshift-ds-update371.patch
+++ b/anslib/patches/openshift/openshift-ds-update371.patch
diff --git a/anslib/patches/registry-ds-glusterfs-fixes.patch b/anslib/patches/openshift/registry-ds-glusterfs-fixes.patch
index 65f30e5..65f30e5 100644
--- a/anslib/patches/registry-ds-glusterfs-fixes.patch
+++ b/anslib/patches/openshift/registry-ds-glusterfs-fixes.patch
diff --git a/anslib/patches/registry-ds-glusterfs-storageclass.patch b/anslib/patches/openshift/registry-ds-glusterfs-storageclass.patch
index a189091..a189091 100644
--- a/anslib/patches/registry-ds-glusterfs-storageclass.patch
+++ b/anslib/patches/openshift/registry-ds-glusterfs-storageclass.patch
diff --git a/anslib/patches/template_broker-ds-badcheck.patch b/anslib/patches/openshift/template_broker-ds-badcheck.patch
index 477ec66..477ec66 100644
--- a/anslib/patches/template_broker-ds-badcheck.patch
+++ b/anslib/patches/openshift/template_broker-ds-badcheck.patch