Revision e04860cc
b/lib/cmdlib/common.py | ||
---|---|---|
1 | 1 |
# |
2 | 2 |
# |
3 | 3 |
|
4 |
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Google Inc. |
|
4 |
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Google Inc.
|
|
5 | 5 |
# |
6 | 6 |
# This program is free software; you can redistribute it and/or modify |
7 | 7 |
# it under the terms of the GNU General Public License as published by |
... | ... | |
1335 | 1335 |
return opcodes.OpNetworkConnect( |
1336 | 1336 |
group_name=group_uuid, |
1337 | 1337 |
network_name=network, |
1338 |
network_mode=constants.NIC_MODE_ROUTED,
|
|
1338 |
network_mode=constants.INSTANCE_COMMUNICATION_NETWORK_MODE,
|
|
1339 | 1339 |
network_link=constants.INSTANCE_COMMUNICATION_NETWORK_LINK, |
1340 | 1340 |
conflicts_check=True) |
b/src/Ganeti/Constants.hs | ||
---|---|---|
4771 | 4771 |
-- * Instance communication |
4772 | 4772 |
-- |
4773 | 4773 |
-- The instance communication attaches an additional NIC, named |
4774 |
-- @instanceCommunicationNicPrefix@:@instanceName@ and prefixed by |
|
4775 |
-- @instanceCommunicationMacPrefix@, to the instances that have |
|
4776 |
-- instance communication enabled. This NIC is part of the network |
|
4777 |
-- @instanceCommunicationNetworkName@, which is in turn created by |
|
4778 |
-- 'gnt-network'. This network is defined as |
|
4779 |
-- @instanceCommunicationNetwork4@ for IPv4 and |
|
4780 |
-- @instanceCommunicationNetwork6@ for IPv6. |
|
4774 |
-- @instanceCommunicationNicPrefix@:@instanceName@ with MAC address |
|
4775 |
-- prefixed by @instanceCommunicationMacPrefix@, to the instances that |
|
4776 |
-- have instance communication enabled. This NIC is part of the |
|
4777 |
-- instance communication network which is supplied by the user via |
|
4778 |
-- |
|
4779 |
-- gnt-cluster modify --instance-communication=mynetwork |
|
4780 |
-- |
|
4781 |
-- This network is defined as @instanceCommunicationNetwork4@ for IPv4 |
|
4782 |
-- and @instanceCommunicationNetwork6@ for IPv6. |
|
4781 | 4783 |
|
4782 | 4784 |
instanceCommunicationDoc :: String |
4783 | 4785 |
instanceCommunicationDoc = |
... | ... | |
4799 | 4801 |
instanceCommunicationNetworkLink :: String |
4800 | 4802 |
instanceCommunicationNetworkLink = "communication_rt" |
4801 | 4803 |
|
4804 |
instanceCommunicationNetworkMode :: String |
|
4805 |
instanceCommunicationNetworkMode = nicModeRouted |
|
4806 |
|
|
4802 | 4807 |
instanceCommunicationNicPrefix :: String |
4803 | 4808 |
instanceCommunicationNicPrefix = "ganeti:communication:" |
4804 | 4809 |
|
Also available in: Unified diff