summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-10-31 11:00:35 -0400
committerScott Dodson <sdodson@redhat.com>2016-10-31 13:00:46 -0400
commit11e03c8fed53fdedec76fdc8ef893767f2d3ddd5 (patch)
tree203ffa6ba8a38116131f5015e0dc9877528d8289
parente5fdc799b8ff193ff275c6071dac1db9914a2607 (diff)
downloadopenshift-11e03c8fed53fdedec76fdc8ef893767f2d3ddd5.tar.gz
openshift-11e03c8fed53fdedec76fdc8ef893767f2d3ddd5.tar.bz2
openshift-11e03c8fed53fdedec76fdc8ef893767f2d3ddd5.tar.xz
openshift-11e03c8fed53fdedec76fdc8ef893767f2d3ddd5.zip
Touch all ini_file files before using them
Ansible 2.2 adds 'create' flag, however we'd like to preserve backwards compatability. Fixes bug 1390169 Fixes BZ1390169 Fixes #2668
-rw-r--r--roles/openshift_cloud_provider/tasks/aws.yml12
-rw-r--r--roles/openshift_loadbalancer/tasks/main.yml10
2 files changed, 21 insertions, 1 deletions
diff --git a/roles/openshift_cloud_provider/tasks/aws.yml b/roles/openshift_cloud_provider/tasks/aws.yml
index bf2abcbf5..2267277f1 100644
--- a/roles/openshift_cloud_provider/tasks/aws.yml
+++ b/roles/openshift_cloud_provider/tasks/aws.yml
@@ -1,4 +1,14 @@
-- name: Create cloud config
+# Work around ini_file create option in 2.2 which defaults to no
+- name: Create cloud config file
+ file:
+ dest: "{{ openshift.common.config_base }}/cloudprovider/aws.conf"
+ state: touch
+ mode: 0660
+ owner: root
+ group: root
+ changed_when: false
+
+- name: Configure AWS cloud provider
ini_file:
dest: "{{ openshift.common.config_base }}/cloudprovider/aws.conf"
section: Global
diff --git a/roles/openshift_loadbalancer/tasks/main.yml b/roles/openshift_loadbalancer/tasks/main.yml
index b8e6a7da2..d5f2e56a6 100644
--- a/roles/openshift_loadbalancer/tasks/main.yml
+++ b/roles/openshift_loadbalancer/tasks/main.yml
@@ -10,6 +10,16 @@
path: /etc/systemd/system/haproxy.service.d
state: directory
+# Work around ini_file create option in 2.2 which defaults to no
+- name: Create limits.conf file
+ file:
+ dest: /etc/systemd/system/haproxy.service.d/limits.conf
+ state: touch
+ mode: 0660
+ owner: root
+ group: root
+ changed_when: false
+
- name: Configure the nofile limits for haproxy
ini_file:
dest: /etc/systemd/system/haproxy.service.d/limits.conf