diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-15 03:20:11 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-15 05:04:09 -0400 |
| commit | 9700b7b66789f300bbe99743719ca699457b3b91 (patch) | |
| tree | d4f0237240248580a9d842b0506e1226ad78125b /roles/openshift_cli | |
| parent | c633ce7b8707f311763fa4b707f1ea159265c7d4 (diff) | |
| download | openshift-9700b7b66789f300bbe99743719ca699457b3b91.tar.gz openshift-9700b7b66789f300bbe99743719ca699457b3b91.tar.bz2 openshift-9700b7b66789f300bbe99743719ca699457b3b91.tar.xz openshift-9700b7b66789f300bbe99743719ca699457b3b91.zip | |
Move common common facts to openshift_facts
- Prevents roles that need common facts from needing to require
openshift_common, which pulls in the openshift binary.
- Add dependency on openshift_facts to os_firewall, since it uses
openshift.common facts
Diffstat (limited to 'roles/openshift_cli')
| -rw-r--r-- | roles/openshift_cli/meta/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_cli/tasks/main.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_cli/meta/main.yml b/roles/openshift_cli/meta/main.yml index 4351e8f24..62de120c6 100644 --- a/roles/openshift_cli/meta/main.yml +++ b/roles/openshift_cli/meta/main.yml @@ -12,6 +12,6 @@ galaxy_info: categories: - cloud dependencies: +- role: openshift_common - role: openshift_docker when: openshift.common.is_containerized | bool -- role: openshift_common diff --git a/roles/openshift_cli/tasks/main.yml b/roles/openshift_cli/tasks/main.yml index 62a4dd690..e82903b81 100644 --- a/roles/openshift_cli/tasks/main.yml +++ b/roles/openshift_cli/tasks/main.yml @@ -1,8 +1,8 @@ --- +# TODO: move this to a new 'cli' role - openshift_facts: role: common local_facts: - deployment_type: "{{ openshift_deployment_type }}" cli_image: "{{ osm_image | default(None) }}" - name: Install clients |