diff options
| author | Luke Meyer <lmeyer@redhat.com> | 2017-03-22 15:23:29 -0400 |
|---|---|---|
| committer | Luke Meyer <lmeyer@redhat.com> | 2017-03-29 11:59:47 -0400 |
| commit | f5827111a7609b3c6f7f72a03c8bc13fee2bbb60 (patch) | |
| tree | 8b1cacfc6290c3a9d33c5a23c56e2715a4d2c399 /playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | |
| parent | d77a9a685c3add9ef9c4d659ee47ebf35e145fe4 (diff) | |
| download | openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.tar.gz openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.tar.bz2 openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.tar.xz openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.zip | |
validate and normalize inventory variables
In openshift_repos and everywhere, ensure deployment_type and
openshift_deployment_type are defined and the same.
We really want to set openshift_deployment_type, but users will likely
still have just deployment_type, so accept both. And don't make every
playbook default openshift_deployment_type to deployment_type.
This introduces the openshift_sanitize_inventory role to run before anything else.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/post_control_plane.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml index 6f096f705..c00795a8d 100644 --- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml @@ -5,7 +5,6 @@ - name: Upgrade default router and default registry hosts: oo_first_master vars: - openshift_deployment_type: "{{ deployment_type }}" registry_image: "{{ openshift.master.registry_url | replace( '${component}', 'docker-registry' ) | replace ( '${version}', openshift_image_tag ) }}" router_image: "{{ openshift.master.registry_url | replace( '${component}', 'haproxy-router' ) | replace ( '${version}', openshift_image_tag ) }}" oc_cmd: "{{ openshift.common.client_binary }} --config={{ openshift.common.config_base }}/master/admin.kubeconfig" |