From 9700b7b66789f300bbe99743719ca699457b3b91 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Tue, 15 Mar 2016 03:20:11 -0400 Subject: 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 --- roles/openshift_cli/meta/main.yml | 2 +- roles/openshift_cli/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_cli') 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 -- cgit v1.2.1