From 4c04348577ef9de728c1d228a2c5f7fd8a49fe9f Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Thu, 19 Jan 2017 04:19:04 -0500 Subject: [PATCH] Disable nagios installation by default Packstack install nagios server in controller node by default. Given the lack of integration between nagios and OpenStack services provided as deployed by packstack, i think this shouldn't be the case. This patch disables nagios installation by default. Change-Id: I19df1a09d971a06ee94dc543a003a5fd55dcb1f2 --- packstack/plugins/prescript_000.py | 2 +- .../notes/change-default-nagios-b190de0737165bf9.yaml | 7 +++++++ tests/scenario001.sh | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/change-default-nagios-b190de0737165bf9.yaml diff --git a/packstack/plugins/prescript_000.py b/packstack/plugins/prescript_000.py index e648935a9..e18b1e7bb 100755 --- a/packstack/plugins/prescript_000.py +++ b/packstack/plugins/prescript_000.py @@ -363,7 +363,7 @@ def initConfig(controller): ), "OPTION_LIST": ["y", "n"], "VALIDATORS": [validators.validate_options], - "DEFAULT_VALUE": 'y', + "DEFAULT_VALUE": 'n', "MASK_INPUT": False, "LOOSE_VALIDATION": False, "CONF_NAME": "CONFIG_NAGIOS_INSTALL", diff --git a/releasenotes/notes/change-default-nagios-b190de0737165bf9.yaml b/releasenotes/notes/change-default-nagios-b190de0737165bf9.yaml new file mode 100644 index 000000000..fd2d27336 --- /dev/null +++ b/releasenotes/notes/change-default-nagios-b190de0737165bf9.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + Default value for configuration option CONFIG_NAGIOS_INSTALL has been + changed to 'n' in Ocata. Users that require nagios installation in their + packstack deployent will need to explicitely modify it to 'y' using + answers file or command line option '--nagios-install'. diff --git a/tests/scenario001.sh b/tests/scenario001.sh index 40026328d..8f0e1a435 100755 --- a/tests/scenario001.sh +++ b/tests/scenario001.sh @@ -26,6 +26,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \ --os-swift-install=n \ --os-manila-install=y \ --os-horizon-ssl=y \ + --nagios-install=y \ --amqp-enable-ssl=y \ --glance-backend=file \ --provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \