From 44f7ddfed6bddbf3137bf979746e6353416f12ae Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 28 Nov 2016 22:07:53 +0000 Subject: [PATCH] drop openshift ansible from here, it is pulled in on the osbs control host now --- roles/ansible-server/templates/ansible.cfg.j2 | 2 +- roles/batcave/tasks/main.yml | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/roles/ansible-server/templates/ansible.cfg.j2 b/roles/ansible-server/templates/ansible.cfg.j2 index 7242eab441..642ce05f79 100644 --- a/roles/ansible-server/templates/ansible.cfg.j2 +++ b/roles/ansible-server/templates/ansible.cfg.j2 @@ -37,7 +37,7 @@ display_args_to_stdout = True gathering = smart # additional paths to search for roles in, colon separated -roles_path = {{ ansible_base }}/ansible/roles:{{ ansible_base }}/openshift-ansible/roles +roles_path = {{ ansible_base }}/ansible/roles # uncomment this to disable SSH key host checking #host_key_checking = False diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml index f6f67ab0cc..d2446d9004 100644 --- a/roles/batcave/tasks/main.yml +++ b/roles/batcave/tasks/main.yml @@ -453,15 +453,3 @@ - selinux - httpd - httpd/website - -# -# We setup some external ansible repos here to use for complex applications we deploy -# -- name: local clone of openshift ansible repo - git: > - refspec=553ce409a40305a984894a980fc3969c11f41aba - dest=/srv/web/infra/openshift-ansible - repo=https://github.com/openshift/openshift-ansible - tags: - - config - - batcave