Merge "ironic-agent postinst fails on systemd with no iptables"

2016-04-04 19:35:42 +00:00
parent fd806e9f42 dd7648277f
commit 792036ec62
1 changed files with 3 additions and 1 deletions
--- a/elements/ironic-agent/post-install.d/80-ironic-agent
+++ b/elements/ironic-agent/post-install.d/80-ironic-agent
@@ -20,7 +20,9 @@ case "$DIB_INIT_SYSTEM" in
        fi
        ;;
    systemd)
-        systemctl disable iptables.service
+        if [[ $(systemctl --no-pager list-unit-files iptables) =~ 'enabled' ]]; then
+            systemctl disable iptables.service
+        fi
        systemctl enable $(svc-map ironic-python-agent).service
        ;;
    sysv)