summaryrefslogtreecommitdiffstats
path: root/playbooks/byo/openshift-cluster
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-30 05:38:56 -0500
committerGitHub <noreply@github.com>2017-03-30 05:38:56 -0500
commit2166209cc50cd7989fdf9fcc58b55e05b180d54b (patch)
treeb6edd906b0b121cdf353e6200a20ad512ff2b21f /playbooks/byo/openshift-cluster
parent52b609645a96bc78d1c0dc4d76d56661b5c2a498 (diff)
parentf5827111a7609b3c6f7f72a03c8bc13fee2bbb60 (diff)
downloadopenshift-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/byo/openshift-cluster')
-rw-r--r--playbooks/byo/openshift-cluster/config.yml1
-rw-r--r--playbooks/byo/openshift-cluster/openshift-logging.yml1
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml1
3 files changed, 0 insertions, 3 deletions
diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml
index 86eff4ca4..4db0720d0 100644
--- a/playbooks/byo/openshift-cluster/config.yml
+++ b/playbooks/byo/openshift-cluster/config.yml
@@ -7,5 +7,4 @@
vars:
openshift_cluster_id: "{{ cluster_id | default('default') }}"
openshift_debug_level: "{{ debug_level | default(2) }}"
- openshift_deployment_type: "{{ deployment_type }}"
openshift_deployment_subtype: "{{ deployment_subtype | default(none) }}"
diff --git a/playbooks/byo/openshift-cluster/openshift-logging.yml b/playbooks/byo/openshift-cluster/openshift-logging.yml
index eebfcd20d..f8eebe898 100644
--- a/playbooks/byo/openshift-cluster/openshift-logging.yml
+++ b/playbooks/byo/openshift-cluster/openshift-logging.yml
@@ -32,4 +32,3 @@
vars:
openshift_cluster_id: "{{ cluster_id | default('default') }}"
openshift_debug_level: "{{ debug_level | default(2) }}"
- openshift_deployment_type: "{{ deployment_type }}"
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml
index d5fd7c424..5feb33be4 100644
--- a/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/docker/upgrade.yml
@@ -30,7 +30,6 @@
g_new_master_hosts: []
g_new_node_hosts: []
openshift_cluster_id: "{{ cluster_id | default('default') }}"
- openshift_deployment_type: "{{ deployment_type }}"
- include: ../../../../common/openshift-cluster/upgrades/initialize_nodes_to_upgrade.yml