diff --git a/deployment/puppet/cluster/files/ocf/ns_conntrackd b/deployment/puppet/cluster/files/ocf/ns_conntrackd index 2625ae2a1d..e84f9fcecf 100644 --- a/deployment/puppet/cluster/files/ocf/ns_conntrackd +++ b/deployment/puppet/cluster/files/ocf/ns_conntrackd @@ -1,10 +1,12 @@ #!/bin/bash # # -# An OCF RA for conntrackd +# An OCF RA for conntrackd in namespace # http://conntrack-tools.netfilter.org/ # -# Copyright (c) 2011 Dominik Klein +# Originaly created by Dominik Klein +# +# Patched by Mirantis # # This program is free software; you can redistribute it and/or modify # it under the terms of version 2 of the GNU General Public License as @@ -144,7 +146,7 @@ get_veth_pair() { ocf_run ip link set dev $OCF_RESKEY_ns_interface netns $OCF_RESKEY_ns ocf_run ip netns exec $OCF_RESKEY_ns ip link set up dev $OCF_RESKEY_ns_interface ocf_run ip link set up dev $OCF_RESKEY_host_interface - ocf_run ip netns exec $OCF_RESKEY_ns ifconfig $OCF_RESKEY_ns_interface 10.0.0.${last_octet}/24 + ocf_run ip netns exec $OCF_RESKEY_ns ip addr add 240.1.0.${last_octet}/24 dev $OCF_RESKEY_ns_interface fi add_to_bridge diff --git a/deployment/puppet/cluster/templates/conntrackd.conf.erb b/deployment/puppet/cluster/templates/conntrackd.conf.erb index dbefab6441..e351758305 100644 --- a/deployment/puppet/cluster/templates/conntrackd.conf.erb +++ b/deployment/puppet/cluster/templates/conntrackd.conf.erb @@ -93,7 +93,7 @@ Sync { # send the synchronization messages. Remember that you must # use a dedicated link for the synchronization messages. # - IPv4_interface 10.0.0.<%= @ipaddress_br_mgmt.rpartition(".")[-1] %> + IPv4_interface 240.1.0.<%= @ipaddress_br_mgmt.rpartition(".")[-1] %> # # The name of the interface that you are going to use to