summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-31 11:58:51 -0700
committerGitHub <noreply@github.com>2017-10-31 11:58:51 -0700
commiteb7c673a19fc6c9e14dae11443a5e7564c8adc81 (patch)
tree8e9693a92f8f418349072176113ad54a311babfa
parente3d95a3e9e26353d5cdfc304f89fe047efb53a44 (diff)
parentdf5aa81c6f85e6f67baa7a248c41a03e56b2c450 (diff)
downloadopenshift-eb7c673a19fc6c9e14dae11443a5e7564c8adc81.tar.gz
openshift-eb7c673a19fc6c9e14dae11443a5e7564c8adc81.tar.bz2
openshift-eb7c673a19fc6c9e14dae11443a5e7564c8adc81.tar.xz
openshift-eb7c673a19fc6c9e14dae11443a5e7564c8adc81.zip
Merge pull request #5949 from mgugino-upstream-stage/ha_controller_ttl
Automatic merge from submit-queue. Remove unused osm_controller_lease_ttl This variable is no longer used and references should be removed. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1507449
-rw-r--r--inventory/byo/hosts.example3
-rw-r--r--roles/openshift_master_facts/tasks/main.yml1
2 files changed, 0 insertions, 4 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example
index 070c20345..e49dd5fa2 100644
--- a/inventory/byo/hosts.example
+++ b/inventory/byo/hosts.example
@@ -310,9 +310,6 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#openshift_master_cluster_hostname=openshift-ansible.test.example.com
#openshift_master_cluster_public_hostname=openshift-ansible.test.example.com
-# Override the default controller lease ttl
-#osm_controller_lease_ttl=30
-
# Configure controller arguments
#osm_controller_args={'resource-quota-sync-period': ['10s']}
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml
index 501be148e..cf0be3bef 100644
--- a/roles/openshift_master_facts/tasks/main.yml
+++ b/roles/openshift_master_facts/tasks/main.yml
@@ -88,7 +88,6 @@
controller_args: "{{ osm_controller_args | default(None) }}"
disabled_features: "{{ osm_disabled_features | default(None) }}"
master_count: "{{ openshift_master_count | default(None) }}"
- controller_lease_ttl: "{{ osm_controller_lease_ttl | default(None) }}"
master_image: "{{ osm_image | default(None) }}"
admission_plugin_config: "{{openshift_master_admission_plugin_config }}"
kube_admission_plugin_config: "{{openshift_master_kube_admission_plugin_config | default(None) }}" # deprecated, merged with admission_plugin_config