summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-05-04 16:42:28 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-05-04 16:42:28 -0400
commit685990fa582bbcbfbc1d93c7c4ba0db9cbba5a4a (patch)
tree30d9bdc17b1e837e812c4603b985206744cc4b43
parent70a5edc15ace30d4df2965088d85bd78ee11f806 (diff)
parent0364e2cc29ce4f83a770d5bf33f74388c71185b1 (diff)
downloadopenshift-685990fa582bbcbfbc1d93c7c4ba0db9cbba5a4a.tar.gz
openshift-685990fa582bbcbfbc1d93c7c4ba0db9cbba5a4a.tar.bz2
openshift-685990fa582bbcbfbc1d93c7c4ba0db9cbba5a4a.tar.xz
openshift-685990fa582bbcbfbc1d93c7c4ba0db9cbba5a4a.zip
Merge pull request #203 from kwoodson/tower_cli
Adding tower_cli.cfg to /etc/tower
-rw-r--r--roles/ansible_tower/tasks/main.yaml10
-rw-r--r--roles/ansible_tower_cli/tasks/main.yml8
-rw-r--r--roles/ansible_tower_cli/templates/tower_cli.cfg.j25
3 files changed, 23 insertions, 0 deletions
diff --git a/roles/ansible_tower/tasks/main.yaml b/roles/ansible_tower/tasks/main.yaml
index a85ce7dcc..d27c48e6a 100644
--- a/roles/ansible_tower/tasks/main.yaml
+++ b/roles/ansible_tower/tasks/main.yaml
@@ -30,3 +30,13 @@
- name: Set (httpd_can_network_connect_db) flag on and keep it persistent across reboots
seboolean: name=httpd_can_network_connect_db state=yes persistent=yes
+
+- name: Setup proot to allow access to /etc/tower/
+ lineinfile:
+ dest: /etc/tower/settings.py
+ backrefs: yes
+ regexp: "^({{ item.option }})( *)="
+ line: '\1\2 = {{ item.value }}'
+ with_items: config_changes | default([])
+
+
diff --git a/roles/ansible_tower_cli/tasks/main.yml b/roles/ansible_tower_cli/tasks/main.yml
index adf02ddc6..65aa6bdf4 100644
--- a/roles/ansible_tower_cli/tasks/main.yml
+++ b/roles/ansible_tower_cli/tasks/main.yml
@@ -1,3 +1,11 @@
---
- name: Install python-ansible-tower-cli
yum: name=python-ansible-tower-cli
+
+- template:
+ src: tower_cli.cfg.j2
+ dest: /etc/tower/tower_cli.cfg
+ owner: awx
+ group: awx
+ mode: 0640
+
diff --git a/roles/ansible_tower_cli/templates/tower_cli.cfg.j2 b/roles/ansible_tower_cli/templates/tower_cli.cfg.j2
new file mode 100644
index 000000000..5a0a275b0
--- /dev/null
+++ b/roles/ansible_tower_cli/templates/tower_cli.cfg.j2
@@ -0,0 +1,5 @@
+[general]
+host = {{ oo_towercli_host }}
+username = {{ oo_towercli_username }}
+password = {{ oo_towercli_password }}
+verify_ssl = true