Merge branch 'master' into mbruzek-openshift-openstack

1 files changed, 0 insertions, 26 deletions

diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml
index 651d896cf..62d460272 100644
--- a/roles/openshift_sanitize_inventory/tasks/main.yml
+++ b/roles/openshift_sanitize_inventory/tasks/main.yml
@@ -3,37 +3,11 @@
 # the user would also be aware of any deprecated variables they should note to adjust
 - include_tasks: deprecations.yml
 
-- name: Abort when conflicting deployment type variables are set
-  when:
-    - deployment_type is defined
-    - openshift_deployment_type is defined
-    - openshift_deployment_type != deployment_type
-  fail:
-    msg: |-
-      openshift_deployment_type is set to "{{ openshift_deployment_type }}".
-      deployment_type is set to "{{ deployment_type }}".
-      To avoid unexpected results, this conflict is not allowed.
-      deployment_type is deprecated in favor of openshift_deployment_type.
-      Please specify only openshift_deployment_type, or make both the same.
-
 - name: Standardize on latest variable names
   set_fact:
-    # goal is to deprecate deployment_type in favor of openshift_deployment_type.
-    # both will be accepted for now, but code should refer to the new name.
-    # TODO: once this is well-documented, add deprecation notice if using old name.
-    deployment_type: "{{ openshift_deployment_type | default(deployment_type) | default | string }}"
-    openshift_deployment_type: "{{ openshift_deployment_type | default(deployment_type) | default | string }}"
     deployment_subtype: "{{ openshift_deployment_subtype | default(deployment_subtype) | default('basic') | string }}"
     openshift_deployment_subtype: "{{ openshift_deployment_subtype | default(deployment_subtype) | default('basic') | string }}"
 
-- name: Abort when deployment type is invalid
-  # this variable is required; complain early and clearly if it is invalid.
-  when: openshift_deployment_type not in known_openshift_deployment_types
-  fail:
-    msg: |-
-      Please set openshift_deployment_type to one of:
-      {{ known_openshift_deployment_types | join(', ') }}
-
 - name: Normalize openshift_release
   set_fact:
     # Normalize release if provided, e.g. "v3.5" => "3.5"