summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-05-05 15:39:38 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-05-05 15:39:38 -0400
commita7090d80d93186ab6875b0680143cd2b694d59cc (patch)
treeb2c8e5b8502501b6abc05270735db44363b75140
parentf5bbebc9d663c0c81215e2b768748d5852390288 (diff)
parent52594518ceff4fb54d589dcab2c1d753af77cc89 (diff)
downloadopenshift-a7090d80d93186ab6875b0680143cd2b694d59cc.tar.gz
openshift-a7090d80d93186ab6875b0680143cd2b694d59cc.tar.bz2
openshift-a7090d80d93186ab6875b0680143cd2b694d59cc.tar.xz
openshift-a7090d80d93186ab6875b0680143cd2b694d59cc.zip
Merge pull request #204 from kwoodson/tower_cli_link
Added symlink to fix ansible_tower_cli
-rw-r--r--roles/ansible_tower/tasks/main.yaml4
-rw-r--r--roles/ansible_tower_cli/tasks/main.yml7
2 files changed, 9 insertions, 2 deletions
diff --git a/roles/ansible_tower/tasks/main.yaml b/roles/ansible_tower/tasks/main.yaml
index d27c48e6a..c110a3b70 100644
--- a/roles/ansible_tower/tasks/main.yaml
+++ b/roles/ansible_tower/tasks/main.yaml
@@ -36,7 +36,7 @@
dest: /etc/tower/settings.py
backrefs: yes
regexp: "^({{ item.option }})( *)="
- line: '\1\2 = {{ item.value }}'
- with_items: config_changes | default([])
+ line: '\1\2= {{ item.value }}'
+ with_items: config_changes | default([], true)
diff --git a/roles/ansible_tower_cli/tasks/main.yml b/roles/ansible_tower_cli/tasks/main.yml
index 65aa6bdf4..41fac22a0 100644
--- a/roles/ansible_tower_cli/tasks/main.yml
+++ b/roles/ansible_tower_cli/tasks/main.yml
@@ -9,3 +9,10 @@
group: awx
mode: 0640
+- file:
+ state: link
+ src: /etc/tower
+ dest: /etc/awx
+ owner: awx
+ group: awx
+