diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-02-17 17:18:20 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-02-24 23:09:23 -0500 |
| commit | 114fcaac2a8f8e3d68baf8945f8991b1da9763ee (patch) | |
| tree | 200b3d3bea0316a1281658c54cc966c48e043704 /playbooks/gce | |
| parent | 50f53296253953fb2d3fff6bd7d7d3e538b9430b (diff) | |
| download | openshift-114fcaac2a8f8e3d68baf8945f8991b1da9763ee.tar.gz openshift-114fcaac2a8f8e3d68baf8945f8991b1da9763ee.tar.bz2 openshift-114fcaac2a8f8e3d68baf8945f8991b1da9763ee.tar.xz openshift-114fcaac2a8f8e3d68baf8945f8991b1da9763ee.zip | |
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.
Diffstat (limited to 'playbooks/gce')
| -rw-r--r-- | playbooks/gce/openshift-master/config.yml | 8 | ||||
| l--------- | playbooks/gce/openshift-master/filter_plugins | 1 | ||||
| l--------- | playbooks/gce/openshift-master/roles | 1 | ||||
| -rw-r--r-- | playbooks/gce/openshift-node/config.yml | 8 | ||||
| l--------- | playbooks/gce/openshift-node/filter_plugins | 1 | ||||
| l--------- | playbooks/gce/openshift-node/roles | 1 |
6 files changed, 12 insertions, 8 deletions
diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml index cfdb5bbbe..fa5649306 100644 --- a/playbooks/gce/openshift-master/config.yml +++ b/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 diff --git a/playbooks/gce/openshift-master/filter_plugins b/playbooks/gce/openshift-master/filter_plugins new file mode 120000 index 000000000..99a95e4ca --- /dev/null +++ b/playbooks/gce/openshift-master/filter_plugins @@ -0,0 +1 @@ +../../../filter_plugins
\ No newline at end of file diff --git a/playbooks/gce/openshift-master/roles b/playbooks/gce/openshift-master/roles new file mode 120000 index 000000000..20c4c58cf --- /dev/null +++ b/playbooks/gce/openshift-master/roles @@ -0,0 +1 @@ +../../../roles
\ No newline at end of file diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml index c9cacbc63..dcf5d4f94 100644 --- a/playbooks/gce/openshift-node/config.yml +++ b/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(['']) }}", diff --git a/playbooks/gce/openshift-node/filter_plugins b/playbooks/gce/openshift-node/filter_plugins new file mode 120000 index 000000000..99a95e4ca --- /dev/null +++ b/playbooks/gce/openshift-node/filter_plugins @@ -0,0 +1 @@ +../../../filter_plugins
\ No newline at end of file diff --git a/playbooks/gce/openshift-node/roles b/playbooks/gce/openshift-node/roles new file mode 120000 index 000000000..20c4c58cf --- /dev/null +++ b/playbooks/gce/openshift-node/roles @@ -0,0 +1 @@ +../../../roles
\ No newline at end of file |