summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-03-01 14:55:31 -0500
committerKenny Woodson <kwoodson@redhat.com>2017-03-01 14:55:31 -0500
commitefd4350d9147dc1ed3331edbd338661eac271032 (patch)
tree689812e5ec7a7b7f08c0cef8bd5f41dcaaf0ff43
parent5ada5e9bcad7a8d361b47bb471c681964490be5f (diff)
downloadopenshift-efd4350d9147dc1ed3331edbd338661eac271032.tar.gz
openshift-efd4350d9147dc1ed3331edbd338661eac271032.tar.bz2
openshift-efd4350d9147dc1ed3331edbd338661eac271032.tar.xz
openshift-efd4350d9147dc1ed3331edbd338661eac271032.zip
Adding the activeDeadlineSeconds. Removed debug.
-rw-r--r--roles/openshift_hosted/tasks/registry/secure.yml11
-rw-r--r--roles/openshift_hosted/tasks/router/router.yml3
2 files changed, 3 insertions, 11 deletions
diff --git a/roles/openshift_hosted/tasks/registry/secure.yml b/roles/openshift_hosted/tasks/registry/secure.yml
index a082a075a..927c9aa03 100644
--- a/roles/openshift_hosted/tasks/registry/secure.yml
+++ b/roles/openshift_hosted/tasks/registry/secure.yml
@@ -4,14 +4,6 @@
docker_registry_route_hostname: "{{ 'docker-registry-default.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true)) }}"
run_once: true
-- debug: var=openshift_hosted_registry_routecertificates
-
-- debug:
- msg: "{{ ('cafile' in openshift_hosted_registry_routecertificates) }}"
-
-- debug:
- msg: "{{ ('cafile' in openshift_hosted_registry_routecertificates) | ternary('THIS IS TRUE', 'THIS IS FALSE') }}"
-
- name: Get the certificate contents for registry
copy:
backup: True
@@ -40,9 +32,6 @@
- "'certfile' in openshift_hosted_registry_routecertificates"
- "'keyfile' in openshift_hosted_registry_routecertificates"
-- debug:
- msg: "{{ openshift_hosted_registry_routehost | default(docker_registry_route_hostname) }}"
-
# When routetermination is passthrough we will create the route
- name: Create passthrough route for docker-registry
oc_route:
diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml
index 71ceff93a..607ace7f9 100644
--- a/roles/openshift_hosted/tasks/router/router.yml
+++ b/roles/openshift_hosted/tasks/router/router.yml
@@ -71,6 +71,9 @@
- key: spec.strategy.rollingParams.updatePeriodSeconds
value: 1
action: put
+ - key: spec.strategy.activeDeadlineSeconds
+ value: 21600
+ action: put
register: routerout
# This should probably move to module