cloudstack4.4.2 升级centos7
1，获取cloudstack git项目最新代码，将packaging项目中的文件复制到cloudstack4.4.2的相同目录2，package.sh 脚本执行时添加参数 sh +x package.sh --pack noredist -d centos7
3，缺少jasypt-1.9.2.jar错误，从maven官方仓库获取jasypt-1.9.2.jar
4，注释maven 3.0.0版本，打包服务器maven版本3.3.1
5，修改libvirtcomputingresource中@@ -1929,7 +1929,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
private String getBroadcastUriFromBridge(String brName) {
String pif = matchPifFileInDirectory(brName);
- Pattern pattern = Pattern.compile("(\\D+)(\\d+)(\\D*)(\\d*)");
+ Pattern pattern = Pattern.compile("(\\D+)(\\d+)(\\D*)(\\d*)(\\D*)(\\d*)(\\D*)(\\d*)");
Matcher matcher = pattern.matcher(pif);
s_logger.debug("getting broadcast uri for pif " + pif + " and bridge " + brName);
if(matcher.find()) {
@@ -1937,8 +1937,10 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return BroadcastDomainType.Vxlan.toUri(matcher.group(2)).toString();
}
else{
- if (!matcher.group(4).isEmpty()) {
+ if (!pif.startsWith("en") && !matcher.group(4).isEmpty()) {
return BroadcastDomainType.Vlan.toUri(matcher.group(4)).toString();
+ } else if (pif.startsWith("en") && !matcher.group(8).isEmpty()){
+ return BroadcastDomainType.Vlan.toUri(matcher.group(8)).toString();
} else {
http://blog.iyunv.com/Mr_WangFT/article/details/
版权声明：本文为博主原创文章，未经博主允许不得转载。
页:
[1]