Merge pull request #5830 from abutcher/registry-deployment

Automatic merge from submit-queue.

Ensure deployment_subtype is set within openshift_sanitize_inventory.

https://bugzilla.redhat.com/show_bug.cgi?id=1504021

playbooks/byo/openshift-cluster/config.yml

@@ -8,5 +8,3 @@
   - always
 
 - include: ../../common/openshift-cluster/config.yml
-  vars:
-    openshift_deployment_subtype: "{{ deployment_subtype | default(none) }}"

roles/openshift_sanitize_inventory/tasks/main.yml

@@ -23,6 +23,8 @@
     # 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.