diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-30 05:38:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-30 05:38:56 -0500 |
| commit | 2166209cc50cd7989fdf9fcc58b55e05b180d54b (patch) | |
| tree | b6edd906b0b121cdf353e6200a20ad512ff2b21f /roles/openshift_facts | |
| parent | 52b609645a96bc78d1c0dc4d76d56661b5c2a498 (diff) | |
| parent | f5827111a7609b3c6f7f72a03c8bc13fee2bbb60 (diff) | |
| download | openshift-2166209cc50cd7989fdf9fcc58b55e05b180d54b.tar.gz openshift-2166209cc50cd7989fdf9fcc58b55e05b180d54b.tar.bz2 openshift-2166209cc50cd7989fdf9fcc58b55e05b180d54b.tar.xz openshift-2166209cc50cd7989fdf9fcc58b55e05b180d54b.zip | |
Merge pull request #3734 from sosiouxme/20170322-deployment-type
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_facts')
| -rw-r--r-- | roles/openshift_facts/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_facts/meta/main.yml b/roles/openshift_facts/meta/main.yml index 0be3afd24..7eead2d6e 100644 --- a/roles/openshift_facts/meta/main.yml +++ b/roles/openshift_facts/meta/main.yml @@ -12,4 +12,5 @@ galaxy_info: categories: - cloud - system -dependencies: [] +dependencies: +- role: openshift_sanitize_inventory diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index 73c668c72..93972f0e0 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -64,8 +64,7 @@ role: common local_facts: debug_level: "{{ openshift_debug_level | default(2) }}" - # TODO: Deprecate deployment_type in favor of openshift_deployment_type - deployment_type: "{{ openshift_deployment_type | default(deployment_type) }}" + deployment_type: "{{ openshift_deployment_type }}" deployment_subtype: "{{ openshift_deployment_subtype | default(None) }}" cluster_id: "{{ openshift_cluster_id | default('default') }}" hostname: "{{ openshift_hostname | default(None) }}" |