diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-26 19:10:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 19:10:39 -0500 |
| commit | c5f4a60fdd9ebc81180a96677717ca96b9badc72 (patch) | |
| tree | 65ad8f8384f37ea8f57faa165ddf5391680f7633 /roles/openshift_node | |
| parent | 670ee735410691c5e2f2709aa17bb2e8e5be3e84 (diff) | |
| parent | 0ee812822a5fe5ba7cc00d00c58744104c2d9fee (diff) | |
| download | openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.gz openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.bz2 openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.xz openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.zip | |
Merge pull request #4234 from vshn/feature/oreg_url_masternode
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/README.md | 9 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/roles/openshift_node/README.md b/roles/openshift_node/README.md index b69b60c1d..fb0b494da 100644 --- a/roles/openshift_node/README.md +++ b/roles/openshift_node/README.md @@ -15,10 +15,11 @@ Role Variables -------------- From this role: -| Name | Default value | | -|------------------------------------------|-----------------------|--------------------------------------------------------| -| openshift_node_debug_level | openshift_debug_level | Verbosity of the debug logs for node | -| oreg_url | UNDEF (Optional) | Default docker registry to use | +| Name | Default value | | +|----------------------------|-----------------------|----------------------------------------------------------| +| openshift_node_debug_level | openshift_debug_level | Verbosity of the debug logs for node | +| oreg_url | UNDEF (Optional) | Default docker registry to use | +| oreg_url_node | UNDEF (Optional) | Default docker registry to use, specifically on the node | From openshift_common: diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 54ba5ba01..a8beaa060 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -22,7 +22,7 @@ iptables_sync_period: "{{ openshift_node_iptables_sync_period | default(None) }}" kubelet_args: "{{ openshift_node_kubelet_args | default(None) }}" labels: "{{ lookup('oo_option', 'openshift_node_labels') | default( openshift_node_labels | default(none), true) }}" - registry_url: "{{ oreg_url | default(none) }}" + registry_url: "{{ oreg_url_node | default(oreg_url) | default(None) }}" schedulable: "{{ openshift_schedulable | default(openshift_scheduleable) | default(None) }}" sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}" storage_plugin_deps: "{{ osn_storage_plugin_deps | default(None) }}" |