diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-31 13:29:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 13:29:17 -0400 |
| commit | 6c66fad9f13530cfa126a8a92e5e940feeaf3a1c (patch) | |
| tree | 7c1f69992a5d679f3a3cce0cfde0663fb30296bf | |
| parent | 0b9e5b499098be3031c0553fc2649cf2b330cdfb (diff) | |
| parent | 11e03c8fed53fdedec76fdc8ef893767f2d3ddd5 (diff) | |
| download | openshift-6c66fad9f13530cfa126a8a92e5e940feeaf3a1c.tar.gz openshift-6c66fad9f13530cfa126a8a92e5e940feeaf3a1c.tar.bz2 openshift-6c66fad9f13530cfa126a8a92e5e940feeaf3a1c.tar.xz openshift-6c66fad9f13530cfa126a8a92e5e940feeaf3a1c.zip | |
Merge pull request #2686 from sdodson/BZ1390169
Touch all ini_file files before using them
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/aws.yml | 12 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/tasks/main.yml | 10 |
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 |