summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@redhat.com>2015-02-24 10:19:17 -0500
committerMatt Woodson <mwoodson@redhat.com>2015-02-24 10:19:17 -0500
commitff08486781625fcdd13210963b94e2c1d3a2e00a (patch)
tree4df6736fb5580f1caaee50a57c9dde74d7774225
parent41ad58a9b9cd59eb5d8bece20d0c1073190d67b4 (diff)
downloadopenshift-ff08486781625fcdd13210963b94e2c1d3a2e00a.tar.gz
openshift-ff08486781625fcdd13210963b94e2c1d3a2e00a.tar.bz2
openshift-ff08486781625fcdd13210963b94e2c1d3a2e00a.tar.xz
openshift-ff08486781625fcdd13210963b94e2c1d3a2e00a.zip
cleaned up ansible tower
-rw-r--r--roles/ansible_tower/files/inventory5
-rw-r--r--roles/ansible_tower/files/tower_setup_conf.yml10
-rw-r--r--roles/ansible_tower/tasks/main.yaml8
3 files changed, 4 insertions, 19 deletions
diff --git a/roles/ansible_tower/files/inventory b/roles/ansible_tower/files/inventory
deleted file mode 100644
index c4f03c7fb..000000000
--- a/roles/ansible_tower/files/inventory
+++ /dev/null
@@ -1,5 +0,0 @@
-[primary]
-localhost
-
-[all:children]
-primary
diff --git a/roles/ansible_tower/files/tower_setup_conf.yml b/roles/ansible_tower/files/tower_setup_conf.yml
deleted file mode 100644
index 023e6cd3e..000000000
--- a/roles/ansible_tower/files/tower_setup_conf.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-admin_password: Wd97YLJkqt0Z
-database: external
-munin_password: Wd97YLJkqt0Z
-pg_database: tower
-pg_host: use-tower1.cx5dyo4uindu.us-east-1.rds.amazonaws.com
-pg_password: qG3JwuXb6uXi
-pg_port: 5432
-pg_username: tower_admin
-primary_machine: localhost
-redis_password: wbTneuaKu4YSLSmWqCYVQaB83bREadRg8HRvNJX4
diff --git a/roles/ansible_tower/tasks/main.yaml b/roles/ansible_tower/tasks/main.yaml
index 8fe0634d2..090f0ed00 100644
--- a/roles/ansible_tower/tasks/main.yaml
+++ b/roles/ansible_tower/tasks/main.yaml
@@ -11,13 +11,13 @@
- ack
- 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-{{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
-#- name: extract Tower
-# unarchive: src=/opt/ansible-tower-setup-2.1.1.tar.gz dest=/opt copy=no
-#
+- name: extract Tower
+ unarchive: src=/opt/ansible-tower-setup-2.1.1.tar.gz dest=/opt copy=no
+
#- 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
#