diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-30 05:38:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-30 05:38:56 -0500 |
| commit | 2166209cc50cd7989fdf9fcc58b55e05b180d54b (patch) | |
| tree | b6edd906b0b121cdf353e6200a20ad512ff2b21f /playbooks/common/openshift-cluster/upgrades | |
| parent | 52b609645a96bc78d1c0dc4d76d56661b5c2a498 (diff) | |
| parent | f5827111a7609b3c6f7f72a03c8bc13fee2bbb60 (diff) | |
| download | openshift-2166209cc50cd7989fdf9fcc58b55e05b180d54b.tar.gz openshift-2166209cc50cd7989fdf9fcc58b55e05b180d54b.tar.bz2 openshift-2166209cc50cd7989fdf9fcc58b55e05b180d54b.tar.xz openshift-2166209cc50cd7989fdf9fcc58b55e05b180d54b.zip | |
Merge pull request #3734 from sosiouxme/20170322-deployment-type
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/init.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/post_control_plane.yml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml index a3b8c489e..bcbc4ee02 100644 --- a/playbooks/common/openshift-cluster/upgrades/init.yml +++ b/playbooks/common/openshift-cluster/upgrades/init.yml @@ -29,7 +29,6 @@ g_new_master_hosts: [] g_new_node_hosts: [] openshift_cluster_id: "{{ cluster_id | default('default') }}" - openshift_deployment_type: "{{ deployment_type }}" - name: Set oo_options hosts: oo_all_hosts 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" |