summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-10-20 13:34:18 -0400
committerAndrew Butcher <abutcher@redhat.com>2017-10-20 13:34:32 -0400
commit4fd0ebf47da746bd13421240b00b32b1376487e3 (patch)
tree0d56c921403c75c5d42493d3da0dcd90c7319ff0
parente9a4c783e654fb65111633a537ff6842535733c8 (diff)
downloadopenshift-4fd0ebf47da746bd13421240b00b32b1376487e3.tar.gz
openshift-4fd0ebf47da746bd13421240b00b32b1376487e3.tar.bz2
openshift-4fd0ebf47da746bd13421240b00b32b1376487e3.tar.xz
openshift-4fd0ebf47da746bd13421240b00b32b1376487e3.zip
Ensure deployment_subtype is set within openshift_sanitize_inventory.
-rw-r--r--playbooks/byo/openshift-cluster/config.yml2
-rw-r--r--roles/openshift_sanitize_inventory/tasks/main.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml
index 60fa44c5b..f2e52782b 100644
--- a/playbooks/byo/openshift-cluster/config.yml
+++ b/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) }}"
diff --git a/roles/openshift_sanitize_inventory/tasks/main.yml b/roles/openshift_sanitize_inventory/tasks/main.yml
index e327ee9f5..fec06c664 100644
--- a/roles/openshift_sanitize_inventory/tasks/main.yml
+++ b/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.