openstack/fuel-library
Code Issues Proposed changes

Merge "Set reserved network for conntrackd"

Browse Source
This commit is contained in:
Jenkins 2015-04-23 10:07:52 +00:00 committed by Gerrit Code Review
commit dbb93e85b8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/puppet/cluster/files/ocf/ns_conntrackd
View File

@ -1,10 +1,12 @@
#!/bin/bash #!/bin/bash
# #
# #
# An OCF RA for conntrackd # An OCF RA for conntrackd in namespace
# http://conntrack-tools.netfilter.org/ # 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 # 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 # 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 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 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 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 fi
add_to_bridge add_to_bridge

2
deployment/puppet/cluster/templates/conntrackd.conf.erb
View File

@ -93,7 +93,7 @@ Sync {
# send the synchronization messages. Remember that you must # send the synchronization messages. Remember that you must
# use a dedicated link for the synchronization messages. # 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 # The name of the interface that you are going to use to