diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-30 14:14:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 14:14:18 -0700 |
| commit | 62cb2a8d573928cb54a7d0ba475d61a6b65e0307 (patch) | |
| tree | 74dc3c17224fe6d2b3bd4dfffc521e348c74eeb8 /roles/openshift_master_facts | |
| parent | 99c3117df11f1d6b5240dc72f57b2f7f541a234a (diff) | |
| parent | b649749bac0a086199820f91f85fe42ba99f206e (diff) | |
| download | openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.gz openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.bz2 openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.tar.xz openshift-62cb2a8d573928cb54a7d0ba475d61a6b65e0307.zip | |
Merge pull request #5449 from abutcher/wildcard-router-cert-redeploy
Automatic merge from submit-queue.
Bug 1490186: Router pod not running after router certificates redeployment
This carries https://github.com/openshift/openshift-ansible/pull/5417. More of the router cert redeploy logic could be moved into the `openshift_hosted` role with a flag. I may pull those over.
https://bugzilla.redhat.com/show_bug.cgi?id=1490186
Diffstat (limited to 'roles/openshift_master_facts')
| -rw-r--r-- | roles/openshift_master_facts/defaults/main.yml | 2 | ||||
| l--------- | roles/openshift_master_facts/lookup_plugins/oo_option.py | 1 | ||||
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/roles/openshift_master_facts/defaults/main.yml b/roles/openshift_master_facts/defaults/main.yml index a80313505..d0dcdae4b 100644 --- a/roles/openshift_master_facts/defaults/main.yml +++ b/roles/openshift_master_facts/defaults/main.yml @@ -1,5 +1,5 @@ --- -openshift_master_default_subdomain: "{{ lookup('oo_option', 'openshift_master_default_subdomain') | default(None, true) }}" +openshift_master_default_subdomain: "router.default.svc.cluster.local" openshift_master_admission_plugin_config: openshift.io/ImagePolicy: configuration: diff --git a/roles/openshift_master_facts/lookup_plugins/oo_option.py b/roles/openshift_master_facts/lookup_plugins/oo_option.py deleted file mode 120000 index 5ae43f8dd..000000000 --- a/roles/openshift_master_facts/lookup_plugins/oo_option.py +++ /dev/null @@ -1 +0,0 @@ -../../../lookup_plugins/oo_option.py
\ No newline at end of file diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index fa228af2a..a95570d38 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/roles/openshift_master_facts/tasks/main.yml @@ -1,5 +1,4 @@ --- - # Ensure the default sub-domain is set: - name: Migrate legacy osm_default_subdomain fact set_fact: |