diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-19 01:26:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 01:26:36 -0800 |
| commit | f119b7c15b10e9d20b5fb9d234c7cd2e54b402e6 (patch) | |
| tree | 7a03dfd07cd1b237532a3afe27889ed093f02b9a /roles | |
| parent | ee8592c34d48f9b65b38aab6cfb8f57a4b5edcbd (diff) | |
| parent | 7e653559d9503e1b7dc0bb43308427c227bcf82e (diff) | |
| download | openshift-f119b7c15b10e9d20b5fb9d234c7cd2e54b402e6.tar.gz openshift-f119b7c15b10e9d20b5fb9d234c7cd2e54b402e6.tar.bz2 openshift-f119b7c15b10e9d20b5fb9d234c7cd2e54b402e6.tar.xz openshift-f119b7c15b10e9d20b5fb9d234c7cd2e54b402e6.zip | |
Merge pull request #6517 from mgugino-upstream-stage/router-selector
Automatic merge from submit-queue.
Fix hosted_reg_router selectors
This commit removes duplicate (and incorrect) assignment
of openshift_hosted_registry_selector and
openshift_hosted_router_selector
Fixes https://github.com/openshift/origin/issues/17682
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_facts/defaults/main.yml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/roles/openshift_facts/defaults/main.yml b/roles/openshift_facts/defaults/main.yml index 53a3bc87e..804b274a2 100644 --- a/roles/openshift_facts/defaults/main.yml +++ b/roles/openshift_facts/defaults/main.yml @@ -94,11 +94,6 @@ openshift_prometheus_alertbuffer_storage_access_modes: openshift_prometheus_alertbuffer_storage_create_pv: True openshift_prometheus_alertbuffer_storage_create_pvc: False - -openshift_router_selector: "region=infra" -openshift_hosted_router_selector: "{{ openshift_router_selector }}" -openshift_hosted_registry_selector: "{{ openshift_router_selector }}" - openshift_service_type_dict: origin: origin openshift-enterprise: atomic-openshift |