[ https://issues.apache.org/jira/browse/CLOUDSTACK-8814?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14736733#comment-14736733 ]
ASF GitHub Bot commented on CLOUDSTACK-8814: -------------------------------------------- Github user wilderrodrigues commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/788#discussion_r39034047 --- Diff: server/src/com/cloud/network/router/NetworkHelperImpl.java --- @@ -610,20 +608,22 @@ protected HypervisorType getClusterToStartDomainRouterForOvm(final long podId) { throw new CloudRuntimeException(errMsg); } - @Override - public LinkedHashMap<Network, List<? extends NicProfile>> configureDefaultNics(final RouterDeploymentDefinition routerDeploymentDefinition) throws ConcurrentOperationException, InsufficientAddressCapacityException { - - final LinkedHashMap<Network, List<? extends NicProfile>> networks = new LinkedHashMap<Network, List<? extends NicProfile>>(3); + protected LinkedHashMap<Network, List<? extends NicProfile>> configureControlNic(final RouterDeploymentDefinition routerDeploymentDefinition) { + final LinkedHashMap<Network, List<? extends NicProfile>> controlConfig = new LinkedHashMap<Network, List<? extends NicProfile>>(3); - // 1) Control network s_logger.debug("Adding nic for Virtual Router in Control network "); final List<? extends NetworkOffering> offerings = _networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork); final NetworkOffering controlOffering = offerings.get(0); - final Network controlConfig = _networkMgr.setupNetwork(s_systemAccount, controlOffering, routerDeploymentDefinition.getPlan(), null, null, false).get(0); + final Network controlNic = _networkMgr.setupNetwork(s_systemAccount, controlOffering, routerDeploymentDefinition.getPlan(), null, null, false).get(0); - networks.put(controlConfig, new ArrayList<NicProfile>()); + controlConfig.put(controlNic, new ArrayList<NicProfile>()); + + return controlConfig; + } + + protected LinkedHashMap<Network, List<? extends NicProfile>> configurePublicNic(final RouterDeploymentDefinition routerDeploymentDefinition, final boolean hasGuestNic) { + final LinkedHashMap<Network, List<? extends NicProfile>> publicConfig = new LinkedHashMap<Network, List<? extends NicProfile>>(3); --- End diff -- Hi @koushik-das , I just refactored the code and did not bother about the initial size - it was there before. It actually won't change anything in terms of performance. Cheers, Wilder > Order of nics in non-VPC router changed resulting in services to fail > --------------------------------------------------------------------- > > Key: CLOUDSTACK-8814 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8814 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the > default.) > Components: SystemVM > Affects Versions: 4.6.0 > Reporter: Remi Bergsma > Assignee: Wilder Rodrigues > Priority: Critical > Fix For: 4.6.0 > > > When testing a non-vpc setup, CloudStack was not able to ssh to 169.254.x.y > because it was not listening on this ip: > Isolated network, single router doesn't listen on link_local:3922 > tcp 0 0 192.168.23.25:3922 0.0.0.0:* LISTEN > 0 6828 3487/sshd > Redundant isolated router: > tcp 0 0 10.20.1.10:3922 0.0.0.0:* LISTEN > 0 6434 3068/sshd > The reason for this, is that the naming of the interfaces now seems to be the > same (same order) as on VPC routers. This used to be different. > cloud-early-config uses hard-coded eth devices that seem not to have > reflected to these changes. > setup_vpcrouter() { > ... > setup_sshd $ETH0_IP "eth0" > ... > ==> That works! > setup_router() { > .. > setup_sshd $ETH1_IP "eth1" > ==> That goes wrong now. > If we keep this new order, all nics need to be checked. Apache settings, > keepalived etc etc > Here you see the difference: > non-vpc router in 4.4: > root@r-17809-VM:~# ifconfig > eth0 Link encap:Ethernet HWaddr 02:00:1c:e5:00:16 > inet addr:10.1.1.1 Bcast:10.1.1.255 Mask:255.255.255.0 > UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 > RX packets:251172 errors:0 dropped:0 overruns:0 frame:0 > TX packets:223685 errors:0 dropped:0 overruns:0 carrier:0 > collisions:0 txqueuelen:1000 > RX bytes:22836300 (21.7 MiB) TX bytes:106769179 (101.8 MiB) > Interrupt:24 > eth1 Link encap:Ethernet HWaddr 0e:00:a9:fe:01:44 > inet addr:169.254.1.68 Bcast:169.254.255.255 Mask:255.255.0.0 > UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 > RX packets:13052283 errors:0 dropped:0 overruns:0 frame:0 > TX packets:16557626 errors:0 dropped:16 overruns:0 carrier:0 > collisions:0 txqueuelen:1000 > RX bytes:7051380496 (6.5 GiB) TX bytes:3279800734 (3.0 GiB) > Interrupt:25 > eth2 Link encap:Ethernet HWaddr 06:ab:30:00:00:30 > inet addr:178.y.x.22 Bcast:178.y.x.255 Mask:255.255.255.0 > UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 > RX packets:308293122 errors:0 dropped:540 overruns:0 frame:0 > TX packets:364798 errors:0 dropped:0 overruns:0 carrier:0 > collisions:0 txqueuelen:1000 > RX bytes:16920767106 (15.7 GiB) TX bytes:33871999 (32.3 MiB) > Interrupt:26 > non-vpc router in 4.6 > root@r-9-VM:/opt/cloud/bin/cs# ifconfig > eth0 Link encap:Ethernet HWaddr 0e:00:a9:fe:03:04 > inet addr:169.254.3.4 Bcast:169.254.255.255 Mask:255.255.0.0 > UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 > RX packets:1018 errors:0 dropped:0 overruns:0 frame:0 > TX packets:788 errors:0 dropped:0 overruns:0 carrier:0 > collisions:0 txqueuelen:1000 > RX bytes:163208 (159.3 KiB) TX bytes:110389 (107.8 KiB) > eth1 Link encap:Ethernet HWaddr 06:c3:88:00:00:19 > inet addr:192.168.23.25 Bcast:192.168.23.255 Mask:255.255.255.0 > UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 > RX packets:20 errors:0 dropped:0 overruns:0 frame:0 > TX packets:11 errors:0 dropped:0 overruns:0 carrier:0 > collisions:0 txqueuelen:1000 > RX bytes:1344 (1.3 KiB) TX bytes:606 (606.0 B) > eth2 Link encap:Ethernet HWaddr 02:00:6d:bd:00:02 > inet addr:10.1.1.1 Bcast:10.1.1.255 Mask:255.255.255.0 > UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 > RX packets:40 errors:0 dropped:0 overruns:0 frame:0 > TX packets:7 errors:0 dropped:0 overruns:0 carrier:0 > collisions:0 txqueuelen:1000 > RX bytes:4308 (4.2 KiB) TX bytes:294 (294.0 B) > lo Link encap:Local Loopback > inet addr:127.0.0.1 Mask:255.0.0.0 > UP LOOPBACK RUNNING MTU:16436 Metric:1 > RX packets:1 errors:0 dropped:0 overruns:0 frame:0 > TX packets:1 errors:0 dropped:0 overruns:0 carrier:0 > collisions:0 txqueuelen:0 > RX bytes:93 (93.0 B) TX bytes:93 (93.0 B) -- This message was sent by Atlassian JIRA (v6.3.4#6332)