openstack
/
fuel-agent
Code Issues Proposed changes

Add systemctl support for runcmd 

Also for now enabled/disabled actions is
identic for both puppet and mcollective

Change-Id: I818faeb38348bd1c09eec44b194ce3f665f09e96
This commit is contained in:
Ivan Suzdal 2016-06-21 18:21:57 +03:00 committed by Dmitry Teselkin
parent b70ff4e232
commit 348eec834f
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,14 +105,37 @@ puppet:
runcmd:
{% if puppet.enable != 1 %}
- if [ -x /bin/systemctl ]; then
- /bin/systemctl stop puppet
- /bin/systemctl disable puppet
- else
- /usr/sbin/invoke-rc.d puppet stop
- /usr/sbin/update-rc.d -f puppet remove
- echo manual > /etc/init/puppet.override
- fi
{% else %}
- if [ -x /bin/systemctl ]; then
- /bin/systemctl enable puppet
- else
- rm -f /etc/init/puppet.override
- fi
{% endif %}
{% if mcollective.enable != 1 %}
- if [ -x /bin/systemctl ]; then
- /bin/systemctl stop mcollective
- /bin/systemctl disable mcollective
- else
- /usr/sbin/invoke-rc.d mcollective stop
- /usr/sbin/update-rc.d -f mcollective remove
- echo manual > /etc/init/mcollective.override
- fi
{% else %}
- if [ -x /bin/systemctl ]; then
- /bin/systemctl unmask mcollective
- /bin/systemctl enable mcollective
- else
- rm -f /etc/init/mcollective.override
- fi
{% endif %}
- iptables -t filter -F INPUT
- iptables -t filter -F FORWARD