summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-25 13:53:13 -0700
committerGitHub <noreply@github.com>2017-10-25 13:53:13 -0700
commit305e4897dd6591ee8055414f80e43275696558d2 (patch)
tree8c960292aa4716729878575fed3f4544e1961586
parent2055aa066d8219393db64f42afc384c8123f48f2 (diff)
parent4fd0ebf47da746bd13421240b00b32b1376487e3 (diff)
downloadopenshift-305e4897dd6591ee8055414f80e43275696558d2.tar.gz
openshift-305e4897dd6591ee8055414f80e43275696558d2.tar.bz2
openshift-305e4897dd6591ee8055414f80e43275696558d2.tar.xz
openshift-305e4897dd6591ee8055414f80e43275696558d2.zip
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
-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 74c1a51a8..5dccc9faf 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.