Browse Source

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.
Jason DeTiberus 10 years ago
parent
commit
114fcaac2a

+ 4 - 4
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

+ 1 - 0
playbooks/aws/ansible-tower/filter_plugins

@@ -0,0 +1 @@
+../../../filter_plugins

+ 1 - 0
playbooks/aws/ansible-tower/roles

@@ -0,0 +1 @@
+../../../roles

+ 4 - 4
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

+ 1 - 0
playbooks/aws/openshift-master/filter_plugins

@@ -0,0 +1 @@
+../../../filter_plugins

+ 1 - 0
playbooks/aws/openshift-master/roles

@@ -0,0 +1 @@
+../../../roles

+ 4 - 4
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(['']) }}"
       }

+ 1 - 0
playbooks/aws/openshift-node/filter_plugins

@@ -0,0 +1 @@
+../../../filter_plugins

+ 1 - 0
playbooks/aws/openshift-node/roles

@@ -0,0 +1 @@
+../../../roles

+ 2 - 2
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

+ 1 - 0
playbooks/aws/os2-atomic-proxy/filter_plugins

@@ -0,0 +1 @@
+../../../filter_plugins

+ 1 - 0
playbooks/aws/os2-atomic-proxy/roles

@@ -0,0 +1 @@
+../../../roles

+ 4 - 4
playbooks/gce/openshift-master/config.yml

@@ -30,12 +30,12 @@
   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(['']) }}",
         oo_public_ip: "{{ gce_public_ip }}"
       }
-    - ../../../roles/pods
+    - pods

+ 1 - 0
playbooks/gce/openshift-master/filter_plugins

@@ -0,0 +1 @@
+../../../filter_plugins

+ 1 - 0
playbooks/gce/openshift-master/roles

@@ -0,0 +1 @@
+../../../roles

+ 4 - 4
playbooks/gce/openshift-node/config.yml

@@ -37,11 +37,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_master_public_ips: "{{ hostvars['localhost'].oo_master_public_ips | default(['']) }}",
         oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}",

+ 1 - 0
playbooks/gce/openshift-node/filter_plugins

@@ -0,0 +1 @@
+../../../filter_plugins

+ 1 - 0
playbooks/gce/openshift-node/roles

@@ -0,0 +1 @@
+../../../roles