x/bareon
Code Issues Proposed changes

Merge "IBP: configure mcollectived to NOT daemonize on Ubuntu"

Browse Source
This commit is contained in:
Jenkins 2015-05-29 12:49:04 +00:00 committed by Gerrit Code Review
commit f50b1b5bf4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloud-init-templates/cloud_config_ubuntu.jinja2
View File

@ -47,7 +47,7 @@ mcollective:
libdir: /usr/share/mcollective/plugins libdir: /usr/share/mcollective/plugins
logfile: /var/log/mcollective.log logfile: /var/log/mcollective.log
loglevel: debug loglevel: debug
daemonize: 1 daemonize: 0
direct_addressing: 1 direct_addressing: 1
ttl: 4294957 ttl: 4294957
securityprovider: psk securityprovider: psk
@ -92,9 +92,9 @@ runcmd:
{% endif %} {% endif %}
{% if mcollective.enable != 1 %} {% if mcollective.enable != 1 %}
- /usr/sbin/invoke-rc.d mcollective stop - /usr/sbin/invoke-rc.d mcollective stop
- /usr/sbin/update-rc.d -f mcollective remove - echo manual > /etc/init/mcollective.override
{% else %} {% else %}
- /usr/sbin/update-rc.d mcollective defaults - rm -f /etc/init/mcollective.override
- service mcollective restart - service mcollective restart
{% endif %} {% endif %}
- iptables -t filter -F INPUT - iptables -t filter -F INPUT