summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-13 03:54:30 -0800
committerGitHub <noreply@github.com>2018-02-13 03:54:30 -0800
commit47e428995d3fa8f14994b747e32862521bc9dc92 (patch)
treea2461367802a9e5c09b4ec7fce4de5b6801280fa /roles
parentdea7e61fd333b2e167cc5a001e1e8f794402c045 (diff)
parentb58a3cec05bc368aa4ca0b72513fa300edf70ecb (diff)
downloadopenshift-47e428995d3fa8f14994b747e32862521bc9dc92.tar.gz
openshift-47e428995d3fa8f14994b747e32862521bc9dc92.tar.bz2
openshift-47e428995d3fa8f14994b747e32862521bc9dc92.tar.xz
openshift-47e428995d3fa8f14994b747e32862521bc9dc92.zip
Merge pull request #5251 from celebdor/configurable_node_start
Automatic merge from submit-queue. Make node start options configurable Thanks to this, the node startup can be customized. Change-Id: Ifb93bf892d7de52a575b8d0231328d44f733d0aa Signed-off-by: Antoni Segura Puimedon <celebdor@gmail.com>
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/README.md15
-rw-r--r--roles/openshift_node/tasks/config/configure-node-settings.yml2
2 files changed, 12 insertions, 5 deletions
diff --git a/roles/openshift_node/README.md b/roles/openshift_node/README.md
index 87ceb8103..c61742bc2 100644
--- a/roles/openshift_node/README.md
+++ b/roles/openshift_node/README.md
@@ -15,10 +15,17 @@ Role Variables
--------------
From this role:
-| Name | Default value | |
-|----------------------------|-----------------------|----------------------------------------------------------|
-| oreg_url | UNDEF (Optional) | Default docker registry to use |
-| oreg_url_node | UNDEF (Optional) | Default docker registry to use, specifically on the node |
+| Name | Default value | |
+|------------------------------|-----------------------|----------------------------------------------------------|
+| openshift_node_start_options | UNDEF (Optional) | Options to pass to node start cmdline |
+| oreg_url | UNDEF (Optional) | Default docker registry to use |
+| oreg_url_node | UNDEF (Optional) | Default docker registry to use, specifically on the node |
+
+openshift_node_start_options can be used for passing any start node option, e.g.:
+
+--enable=kubelet,plugins
+
+Which would have a node running without kube-proxy and dns.
Dependencies
------------
diff --git a/roles/openshift_node/tasks/config/configure-node-settings.yml b/roles/openshift_node/tasks/config/configure-node-settings.yml
index ebc1426d3..dcdbeb220 100644
--- a/roles/openshift_node/tasks/config/configure-node-settings.yml
+++ b/roles/openshift_node/tasks/config/configure-node-settings.yml
@@ -7,7 +7,7 @@
create: true
with_items:
- regex: '^OPTIONS='
- line: "OPTIONS=--loglevel={{ openshift_node_debug_level }}"
+ line: "OPTIONS=--loglevel={{ openshift_node_debug_level }} {{ openshift_node_start_options | default('') }}"
- regex: '^CONFIG_FILE='
line: "CONFIG_FILE={{ openshift.common.config_base }}/node/node-config.yaml"
- regex: '^IMAGE_VERSION='