diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-15 11:20:29 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-15 11:20:29 -0400 |
| commit | bd1976e5e90847ed5d22fdbef9ecf69e7883458c (patch) | |
| tree | f838f1de42b4d7e7a607bb5f6d8459c1cf099873 /roles/openshift_cli | |
| parent | 28e470b4e6bb526a489aba65e875ac4672e279e2 (diff) | |
| parent | 9700b7b66789f300bbe99743719ca699457b3b91 (diff) | |
| download | openshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.tar.gz openshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.tar.bz2 openshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.tar.xz openshift-bd1976e5e90847ed5d22fdbef9ecf69e7883458c.zip | |
Merge pull request #1603 from detiber/move_common_common_facts
Move common common facts to openshift_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 |