Merge pull request #5186 from mgugino-upstream-stage/flatten-cli

Merged by openshift-bot

playbooks/common/openshift-cluster/initialize_facts.yml

@@ -115,6 +115,7 @@
         debug_level: "{{ openshift_debug_level | default(2) }}"
         deployment_type: "{{ openshift_deployment_type }}"
         deployment_subtype: "{{ openshift_deployment_subtype | default(None) }}"
+        cli_image: "{{ osm_image | default(None) }}"
         cluster_id: "{{ openshift_cluster_id | default('default') }}"
         hostname: "{{ openshift_hostname | default(None) }}"
         ip: "{{ openshift_ip | default(None) }}"

roles/openshift_cli/meta/main.yml

@@ -15,4 +15,4 @@ dependencies:
 - role: openshift_docker
   when: not skip_docker_role | default(False) | bool
 - role: openshift_common
-- role: openshift_cli_facts
+- role: openshift_facts

roles/openshift_cli_facts/meta/main.yml

@@ -1,15 +0,0 @@
----
-galaxy_info:
-  author: Jason DeTiberus
-  description: OpenShift CLI Facts
-  company: Red Hat, Inc.
-  license: Apache License, Version 2.0
-  min_ansible_version: 1.9
-  platforms:
-  - name: EL
-    versions:
-    - 7
-  categories:
-  - cloud
-dependencies:
-- role: openshift_facts

roles/openshift_cli_facts/tasks/main.yml

@@ -1,6 +0,0 @@
----
-# TODO: move this to a new 'cli' role
-- openshift_facts:
-    role: common
-    local_facts:
-      cli_image: "{{ osm_image | default(None) }}"