openstack
/
fuel-agent
Code Issues Proposed changes

Restart mcollective at the end of cloud-init magic 

We use mcollective cloud-init module to configure
mcollective service. This module runs the command
'service mcollective start' which does nothing
if the service is already running (which is the actual case).
So, we can end up with mcollective unable to see
config file changed made by cloud-init and hence
prevent mcollective from being able to connect to
rabbit.

This patch restarts mcollective at the end of cloud-init run.

Closes-Bug: #1455489
Change-Id: I9ea122acc168120596bf48f378e92874936bcbe1
This commit is contained in:
Vladimir Kozhukalov 2015-05-19 14:53:09 +03:00
parent 6dffe4c5b3
commit 787b97eac0
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cloud-init-templates/cloud_config_centos.jinja2
View File

@ -40,6 +40,7 @@ runcmd:
- chkconfig mcollective off
{% else %}
- chkconfig mcollective on
- service mcollective restart
{% endif %}
- iptables -t filter -F INPUT
- iptables -t filter -F FORWARD

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

@ -93,6 +93,9 @@ runcmd:
{% if mcollective.enable != 1 %}
- /usr/sbin/invoke-rc.d mcollective stop
- /usr/sbin/update-rc.d -f mcollective remove
{% else %}
- /usr/sbin/update-rc.d mcollective defaults
- service mcollective restart
{% endif %}
- iptables -t filter -F INPUT
- iptables -t filter -F FORWARD