From 114fcaac2a8f8e3d68baf8945f8991b1da9763ee Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Tue, 17 Feb 2015 17:18:20 -0500
Subject: add symlinks for filter_plugins and roles to playbook directories

- allows playbooks to be able to discover roles and filter_plugins without
  having to manipulate the environment or use relative paths.
---
 playbooks/aws/ansible-tower/config.yml        | 8 ++++----
 playbooks/aws/ansible-tower/filter_plugins    | 1 +
 playbooks/aws/ansible-tower/roles             | 1 +
 playbooks/aws/openshift-master/config.yml     | 8 ++++----
 playbooks/aws/openshift-master/filter_plugins | 1 +
 playbooks/aws/openshift-master/roles          | 1 +
 playbooks/aws/openshift-node/config.yml       | 8 ++++----
 playbooks/aws/openshift-node/filter_plugins   | 1 +
 playbooks/aws/openshift-node/roles            | 1 +
 playbooks/aws/os2-atomic-proxy/config.yml     | 4 ++--
 playbooks/aws/os2-atomic-proxy/filter_plugins | 1 +
 playbooks/aws/os2-atomic-proxy/roles          | 1 +
 12 files changed, 22 insertions(+), 14 deletions(-)
 create mode 120000 playbooks/aws/ansible-tower/filter_plugins
 create mode 120000 playbooks/aws/ansible-tower/roles
 create mode 120000 playbooks/aws/openshift-master/filter_plugins
 create mode 120000 playbooks/aws/openshift-master/roles
 create mode 120000 playbooks/aws/openshift-node/filter_plugins
 create mode 120000 playbooks/aws/openshift-node/roles
 create mode 120000 playbooks/aws/os2-atomic-proxy/filter_plugins
 create mode 120000 playbooks/aws/os2-atomic-proxy/roles

(limited to 'playbooks/aws')

diff --git a/playbooks/aws/ansible-tower/config.yml b/playbooks/aws/ansible-tower/config.yml
index 423860828..30a27d0e0 100644
--- a/playbooks/aws/ansible-tower/config.yml
+++ b/playbooks/aws/ansible-tower/config.yml
@@ -16,7 +16,7 @@
     - vars.yml
     - "vars.{{ oo_env }}.yml"
   roles:
-    - ../../../roles/base_os
-    - ../../../roles/os_ipv6_disable
-    - ../../../roles/ansible
-    - ../../../roles/ansible_tower
+    - base_os
+    - os_ipv6_disable
+    - ansible
+    - ansible_tower
diff --git a/playbooks/aws/ansible-tower/filter_plugins b/playbooks/aws/ansible-tower/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/aws/ansible-tower/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/aws/ansible-tower/roles b/playbooks/aws/ansible-tower/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/aws/ansible-tower/roles
@@ -0,0 +1 @@
+../../../roles
\ No newline at end of file
diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml
index 8a5873189..5bed4ae27 100644
--- a/playbooks/aws/openshift-master/config.yml
+++ b/playbooks/aws/openshift-master/config.yml
@@ -30,11 +30,11 @@
   vars_files:
     - vars.yml
   roles:
-    - ../../../roles/base_os
-    - ../../../roles/repos
+    - base_os
+    - repos
     - {
-        role: ../../../roles/openshift_master,
+        role: openshift_master,
         oo_node_ips: "{{ hostvars['localhost'].oo_node_ips | default(['']) }}",
         oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}"
       }
-    - ../../../roles/pods
+    - pods
diff --git a/playbooks/aws/openshift-master/filter_plugins b/playbooks/aws/openshift-master/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/aws/openshift-master/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/aws/openshift-master/roles b/playbooks/aws/openshift-master/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/aws/openshift-master/roles
@@ -0,0 +1 @@
+../../../roles
\ No newline at end of file
diff --git a/playbooks/aws/openshift-node/config.yml b/playbooks/aws/openshift-node/config.yml
index 2170f14a3..bc2e63585 100644
--- a/playbooks/aws/openshift-node/config.yml
+++ b/playbooks/aws/openshift-node/config.yml
@@ -30,11 +30,11 @@
   vars_files:
     - vars.yml
   roles:
-    - ../../../roles/base_os
-    - ../../../roles/repos
-    - ../../../roles/docker
+    - base_os
+    - repos
+    - docker
     - {
-        role: ../../../roles/openshift_node,
+        role: openshift_node,
         oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}",
         oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}"
       }
diff --git a/playbooks/aws/openshift-node/filter_plugins b/playbooks/aws/openshift-node/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/aws/openshift-node/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/aws/openshift-node/roles b/playbooks/aws/openshift-node/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/aws/openshift-node/roles
@@ -0,0 +1 @@
+../../../roles
\ No newline at end of file
diff --git a/playbooks/aws/os2-atomic-proxy/config.yml b/playbooks/aws/os2-atomic-proxy/config.yml
index 0124156a9..7d384a665 100644
--- a/playbooks/aws/os2-atomic-proxy/config.yml
+++ b/playbooks/aws/os2-atomic-proxy/config.yml
@@ -16,5 +16,5 @@
     - vars.yml
     - "vars.{{ oo_env }}.yml"
   roles:
-    - ../../../roles/atomic_base
-    - ../../../roles/atomic_proxy
+    - atomic_base
+    - atomic_proxy
diff --git a/playbooks/aws/os2-atomic-proxy/filter_plugins b/playbooks/aws/os2-atomic-proxy/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/aws/os2-atomic-proxy/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/aws/os2-atomic-proxy/roles b/playbooks/aws/os2-atomic-proxy/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/aws/os2-atomic-proxy/roles
@@ -0,0 +1 @@
+../../../roles
\ No newline at end of file
-- 
cgit v1.2.3