diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-01 07:19:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-01 07:19:11 +0000 |
| commit | 794a673b05d7479ba8d1b34b3d1c9149304a3528 (patch) | |
| tree | 5eca61cafbbab3ab2c31e6c433e20739dfcf5531 /plugins/xenserver | |
| parent | 17cdb77f467aa64832a660a029dce0a805d901a9 (diff) | |
| parent | cdc5a6a237dd57da59102b2a2020cadd67e4c168 (diff) | |
| download | nova-794a673b05d7479ba8d1b34b3d1c9149304a3528.tar.gz nova-794a673b05d7479ba8d1b34b3d1c9149304a3528.tar.xz nova-794a673b05d7479ba8d1b34b3d1c9149304a3528.zip | |
Merge "Fix ip6tables support in xenapi bug 934603"
Diffstat (limited to 'plugins/xenserver')
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost index 4006de420..e556931bb 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost @@ -227,7 +227,10 @@ def iptables_config(session, args): # either execute iptable-save or iptables-restore # command must be only one of these two # process_input must be used only with iptables-restore - if len(cmd) > 0 and cmd[0] in ('iptables-save', 'iptables-restore'): + if len(cmd) > 0 and cmd[0] in ('iptables-save', + 'iptables-restore', + 'ip6tables-save', + 'ip6tables-restore'): result = _run_command_with_input(cmd, process_input) ret_str = json.dumps(dict(out=result, err='')) |