diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-26 10:20:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-26 10:20:58 -0400 |
| commit | 959e6c311ead326f57fe967b646f44beb4b53bbb (patch) | |
| tree | aef8e975fab911a99ea95b6024a6e6e1c4d40ca8 | |
| parent | f778b5df15397102b9f37b17c41e9e63bffaf135 (diff) | |
| parent | 53028f806e86b2985e79e9103ffbc78ce83b6d57 (diff) | |
| download | openshift-959e6c311ead326f57fe967b646f44beb4b53bbb.tar.gz openshift-959e6c311ead326f57fe967b646f44beb4b53bbb.tar.bz2 openshift-959e6c311ead326f57fe967b646f44beb4b53bbb.tar.xz openshift-959e6c311ead326f57fe967b646f44beb4b53bbb.zip | |
Merge pull request #5186 from mgugino-upstream-stage/flatten-cli
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_facts.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_cli/meta/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_cli_facts/meta/main.yml | 15 | ||||
| -rw-r--r-- | roles/openshift_cli_facts/tasks/main.yml | 6 |
4 files changed, 2 insertions, 22 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_facts.yml b/playbooks/common/openshift-cluster/initialize_facts.yml index 4bf5d33b1..e90a49390 100644 --- a/playbooks/common/openshift-cluster/initialize_facts.yml +++ b/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) }}" diff --git a/roles/openshift_cli/meta/main.yml b/roles/openshift_cli/meta/main.yml index c1de367d9..04a1ce873 100644 --- a/roles/openshift_cli/meta/main.yml +++ b/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 diff --git a/roles/openshift_cli_facts/meta/main.yml b/roles/openshift_cli_facts/meta/main.yml deleted file mode 100644 index 59acde215..000000000 --- a/roles/openshift_cli_facts/meta/main.yml +++ /dev/null @@ -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 diff --git a/roles/openshift_cli_facts/tasks/main.yml b/roles/openshift_cli_facts/tasks/main.yml deleted file mode 100644 index dd1ed8965..000000000 --- a/roles/openshift_cli_facts/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# TODO: move this to a new 'cli' role -- openshift_facts: - role: common - local_facts: - cli_image: "{{ osm_image | default(None) }}" |