Commit e04860cc authored by Jose A. Lopes's avatar Jose A. Lopes
Browse files

Constant for instance communication network mode



Create a new constant to hold the instance communication network mode
as this constant will be necessary during the QA, and update the
general documentation about the constants related to the instance
communication mechanism.
Signed-off-by: default avatarJose A. Lopes <jabolopes@google.com>
Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
parent 67bd83ae
#
#
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Google Inc.
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -1335,6 +1335,6 @@ def ConnectInstanceCommunicationNetworkOp(group_uuid, network):
return opcodes.OpNetworkConnect(
group_name=group_uuid,
network_name=network,
network_mode=constants.NIC_MODE_ROUTED,
network_mode=constants.INSTANCE_COMMUNICATION_NETWORK_MODE,
network_link=constants.INSTANCE_COMMUNICATION_NETWORK_LINK,
conflicts_check=True)
......@@ -4771,13 +4771,15 @@ glusterPortDefault = 24007
-- * Instance communication
--
-- The instance communication attaches an additional NIC, named
-- @instanceCommunicationNicPrefix@:@instanceName@ and prefixed by
-- @instanceCommunicationMacPrefix@, to the instances that have
-- instance communication enabled. This NIC is part of the network
-- @instanceCommunicationNetworkName@, which is in turn created by
-- 'gnt-network'. This network is defined as
-- @instanceCommunicationNetwork4@ for IPv4 and
-- @instanceCommunicationNetwork6@ for IPv6.
-- @instanceCommunicationNicPrefix@:@instanceName@ with MAC address
-- prefixed by @instanceCommunicationMacPrefix@, to the instances that
-- have instance communication enabled. This NIC is part of the
-- instance communication network which is supplied by the user via
--
-- gnt-cluster modify --instance-communication=mynetwork
--
-- This network is defined as @instanceCommunicationNetwork4@ for IPv4
-- and @instanceCommunicationNetwork6@ for IPv6.
instanceCommunicationDoc :: String
instanceCommunicationDoc =
......@@ -4799,6 +4801,9 @@ instanceCommunicationNetwork6 = "fe80::/10"
instanceCommunicationNetworkLink :: String
instanceCommunicationNetworkLink = "communication_rt"
instanceCommunicationNetworkMode :: String
instanceCommunicationNetworkMode = nicModeRouted
instanceCommunicationNicPrefix :: String
instanceCommunicationNicPrefix = "ganeti:communication:"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment