apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.9 to master

Browse Source 
* 4.9:
  CLOUDSTACK-9857: With this change if agent dies the systemd will catch it properly and show process as exited
  CLOUDSTACK-9805: Display VR list in network details
  CLOUDSTACK-9356: FIX Cannot add users in VPC VPN
This commit is contained in:
Rajani Karuturi 2017-04-20 19:32:20 +05:30
commit 9cc3ae8a94
8 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/centos63/cloud-agent.rc
View File

@ -2,6 +2,7 @@
# chkconfig: 35 99 10
# description: Cloud Agent
# pidfile: /var/run/cloudstack-agent.pid
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file

1
packaging/centos7/cloud-agent.rc
View File

@ -2,6 +2,7 @@
# chkconfig: 35 99 10
# description: Cloud Agent
# pidfile: /var/run/cloudstack-agent.pid
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file

1
packaging/fedora20/cloud-agent.rc
View File

@ -2,6 +2,7 @@
# chkconfig: 35 99 10
# description: Cloud Agent
# pidfile: /var/run/cloudstack-agent.pid
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file

1
packaging/fedora21/cloud-agent.rc
View File

@ -2,6 +2,7 @@
# chkconfig: 35 99 10
# description: Cloud Agent
# pidfile: /var/run/cloudstack-agent.pid
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file

15
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
View File

@ -522,21 +522,26 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
boolean success = true;
boolean[] finals = new boolean[users.size()];
Boolean[] finals = new Boolean[users.size()];
for (RemoteAccessVPNServiceProvider element : _vpnServiceProviders) {
s_logger.debug("Applying vpn access to " + element.getName());
for (RemoteAccessVpnVO vpn : vpns) {
try {
String[] results = element.applyVpnUsers(vpn, users);
if (results != null) {
int indexUser = -1;
for (int i = 0; i < results.length; i++) {
s_logger.debug("VPN User " + users.get(i) + (results[i] == null ? " is set on " : (" couldn't be set due to " + results[i]) + " on ") + vpn);
indexUser ++;
if (indexUser == users.size()) {
indexUser = 0; // results on multiple VPC routers are combined in commit 13eb789, reset user index if one VR is done.
}
s_logger.debug("VPN User " + users.get(indexUser) + (results[i] == null ? " is set on " : (" couldn't be set due to " + results[i]) + " on ") + vpn.getUuid());
if (results[i] == null) {
if (!finals[i]) {
finals[i] = true;
if (finals[indexUser] == null) {
finals[indexUser] = true;
}
} else {
finals[i] = false;
finals[indexUser] = false;
success = false;
vpnTemp = vpn;
}

2
ui/index.html
View File

@ -1862,7 +1862,6 @@
<script type="text/javascript" src="scripts/ui-custom/securityRules.js"></script>
<script type="text/javascript" src="scripts/ui-custom/vpc.js"></script>
<script type="text/javascript" src="scripts/vpc.js"></script>
<script type="text/javascript" src="scripts/network.js"></script>
<script type="text/javascript" src="scripts/ui-custom/recurringSnapshots.js"></script>
<script type="text/javascript" src="scripts/ui-custom/uploadVolume.js"></script>
<script type="text/javascript" src="scripts/storage.js"></script>
@ -1877,6 +1876,7 @@
<script type="text/javascript" src="scripts/ui-custom/physicalResources.js"></script>
<script type="text/javascript" src="scripts/ui-custom/zoneWizard.js"></script>
<script type="text/javascript" src="scripts/system.js"></script>
<script type="text/javascript" src="scripts/network.js"></script>
<script type="text/javascript" src="scripts/domains.js"></script>
<script type="text/javascript" src="scripts/docs.js"></script>
<script type="text/javascript" src="scripts/vm_snapshots.js"></script>

17
ui/scripts/network.js
View File

@ -1152,6 +1152,10 @@
hiddenTabs.push('egressRules');
}
if (!isAdmin()) {
hiddenTabs.push("virtualRouters");
}
return hiddenTabs;
},
@ -1615,6 +1619,11 @@
}
});
}
},
virtualRouters: {
title: "label.virtual.appliances",
listView: cloudStack.sections.system.subsections.virtualRouters.sections.routerNoGroup.listView
}
}
}
@ -5444,8 +5453,10 @@
tabFilter: function(args) {
var hiddenTabs = [];
var isRouterOwner = isAdmin();
if (!isRouterOwner)
if (!isRouterOwner) {
hiddenTabs.push("router");
hiddenTabs.push("virtualRouters");
}
return hiddenTabs;
},
@ -5611,6 +5622,10 @@
}
});
}
},
virtualRouters: {
title: "label.virtual.routers",
listView: cloudStack.sections.system.subsections.virtualRouters.sections.routerNoGroup.listView
}
}
}

10
ui/scripts/system.js
View File

@ -9573,6 +9573,16 @@
domainid: args.context.routerGroupByAccount[0].domainid
})
}
if ("networks" in args.context) {
$.extend(data2, {
networkid: args.context.networks[0].id
})
}
if ("vpc" in args.context) {
$.extend(data2, {
vpcid: args.context.vpc[0].id
})
}
}
var routers =[];