From 0a6602e6ff0e1340331002e371f5379ef74934a8 Mon Sep 17 00:00:00 2001
From: Matt Woodson <mwoodson@redhat.com>
Date: Tue, 24 Feb 2015 12:55:41 -0500
Subject: cleaned up ansible tower

---
 roles/ansible/tasks/main.yaml         | 7 +++++++
 roles/ansible_install/tasks/main.yaml | 7 -------
 roles/ansible_tower/tasks/main.yaml   | 9 ++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 roles/ansible/tasks/main.yaml
 delete mode 100644 roles/ansible_install/tasks/main.yaml

(limited to 'roles')

diff --git a/roles/ansible/tasks/main.yaml b/roles/ansible/tasks/main.yaml
new file mode 100644
index 000000000..67a04b919
--- /dev/null
+++ b/roles/ansible/tasks/main.yaml
@@ -0,0 +1,7 @@
+---
+# Install ansible client
+
+- name: Install Ansible
+  yum:
+    pkg: ansible
+    state: installed
diff --git a/roles/ansible_install/tasks/main.yaml b/roles/ansible_install/tasks/main.yaml
deleted file mode 100644
index 67a04b919..000000000
--- a/roles/ansible_install/tasks/main.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Install ansible client
-
-- name: Install Ansible
-  yum:
-    pkg: ansible
-    state: installed
diff --git a/roles/ansible_tower/tasks/main.yaml b/roles/ansible_tower/tasks/main.yaml
index 090f0ed00..f62612eff 100644
--- a/roles/ansible_tower/tasks/main.yaml
+++ b/roles/ansible_tower/tasks/main.yaml
@@ -12,11 +12,10 @@
 
 - name: download Tower setup
 #  get_url: url=http://releases.ansible.com/ansible-tower/setup/ansible-tower-setup-{{tower_version}}.tar.gz
-  get_url: url=http://releases.ansible.com/ansible-tower/setup/ansible-tower-setup-2.1.1.tar.gz
-    dest=/opt/ force=yes
+  get_url: url=http://releases.ansible.com/ansible-tower/setup/ansible-tower-setup-2.1.1.tar.gz dest=/opt/ force=no
 
 - name: extract Tower
-  unarchive: src=/opt/ansible-tower-setup-2.1.1.tar.gz dest=/opt copy=no
+  unarchive: src=/opt/ansible-tower-setup-2.1.1.tar.gz dest=/opt copy=no creates=ansible-tower-setup-2.1.1
 
 #- name: copy tower_setup_conf.yml
 #  copy: src=tower_setup_conf.yml dest=/opt/ansible-tower-setup-2.1.1 owner=root group=root mode=0644
@@ -24,8 +23,8 @@
 #- name: copy inventory
 #  copy: src=inventory dest=/opt/ansible-tower-setup-2.1.1 owner=root group=root mode=0644
 
-- name: run the Tower installer
-  command: chdir=/opt/ansible-tower-setup-2.1.1 creates=/etc/awx/settings.py ./setup.sh
+#- name: run the Tower installer
+#  command: chdir=/opt/ansible-tower-setup-2.1.1 creates=/etc/awx/settings.py ./setup.sh
 
 - name: Open firewalld port for http
   firewalld: port=80/tcp permanent=true state=enabled
-- 
cgit v1.2.3