summaryrefslogtreecommitdiffstats
path: root/roles/ansible/tasks
diff options
context:
space:
mode:
authorTroy Dawson <tdawson@redhat.com>2015-05-21 14:11:25 -0500
committerTroy Dawson <tdawson@redhat.com>2015-05-21 14:11:25 -0500
commit124ca40c134a40b2e6823ab3c4bfe329580d7eaa (patch)
tree6cbc6c67bcefea2ed964c4fbda0aa47c3a2b067c /roles/ansible/tasks
parent803b9191f1a3a2bffe94528a8a5cd82adf6f3a42 (diff)
parentc3bd6a3489dd0473334543024efa2c3c96ba8be2 (diff)
downloadopenshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.gz
openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.bz2
openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.tar.xz
openshift-124ca40c134a40b2e6823ab3c4bfe329580d7eaa.zip
Merge branch 'int' into stg
Diffstat (limited to 'roles/ansible/tasks')
-rw-r--r--roles/ansible/tasks/config.yml8
-rw-r--r--roles/ansible/tasks/main.yml (renamed from roles/ansible/tasks/main.yaml)4
2 files changed, 12 insertions, 0 deletions
diff --git a/roles/ansible/tasks/config.yml b/roles/ansible/tasks/config.yml
new file mode 100644
index 000000000..5e361429b
--- /dev/null
+++ b/roles/ansible/tasks/config.yml
@@ -0,0 +1,8 @@
+---
+- name: modify ansible.cfg
+ lineinfile:
+ dest: /etc/ansible/ansible.cfg
+ backrefs: yes
+ regexp: "^#?({{ item.option }})( *)="
+ line: '\1\2= {{ item.value }}'
+ with_items: cfg_options
diff --git a/roles/ansible/tasks/main.yaml b/roles/ansible/tasks/main.yml
index 67a04b919..5d20a3b35 100644
--- a/roles/ansible/tasks/main.yaml
+++ b/roles/ansible/tasks/main.yml
@@ -5,3 +5,7 @@
yum:
pkg: ansible
state: installed
+
+- include: config.yml
+ vars:
+ cfg_options: "{{ ans_config }}"