From fb434e7b0f662b457e0e928284d15ff5f0eb02a0 Mon Sep 17 00:00:00 2001 From: Karl Goetz Date: Fri, 3 Mar 2017 15:20:24 +1100 Subject: [PATCH] Remove redundant shinken_enable_web_ui2 variable This variable was used once in the project to indicate the web ui should be installed. Since we already need to add it to shinken_broker_modules it makes more sense to re use that variable. Closes: #2 --- README.md | 3 --- defaults/main.yml | 3 --- tasks/main.yml | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index d31b32d..47eaa7f 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,6 @@ have not been implemented yet) # Path of broker configuration shinken_config_broker: /etc/shinken/brokers/ - # Do we want the web UI? - shinken_enable_web_ui2: true - # List of modules to enable in the broker. 'webui2' enables web interface. shinken_broker_modules: 'webui2' diff --git a/defaults/main.yml b/defaults/main.yml index 62dd69e..6f7abc8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,9 +9,6 @@ shinken_virtualenv: /srv/shinken/environment # Path of broker configuration shinken_config_broker: /etc/shinken/brokers/ -# Do we want the web UI? -shinken_enable_web_ui2: true - # List of modules to enable in the broker. 'webui2' enables web interface. shinken_broker_modules: 'webui2' diff --git a/tasks/main.yml b/tasks/main.yml index deacfb1..c00cb57 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -6,5 +6,5 @@ - include: configure-shinken.yml - include: configure-shinken-webui.yml - when: "{{ shinken_enable_web_ui2 }}" + when: '"webui2" in shinken_broker_modules'