[GitHub] [cloudstack] blueorangutan commented on pull request #4131: [HEALTH] Master/4.15 Health Check please don't merge this
blueorangutan commented on pull request #4131: URL: https://github.com/apache/cloudstack/pull/4131#issuecomment-722198084 Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2334 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4131: [HEALTH] Master/4.15 Health Check please don't merge this
blueorangutan commented on pull request #4131: URL: https://github.com/apache/cloudstack/pull/4131#issuecomment-722184171 @Pearl1594 a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Pearl1594 commented on pull request #4131: [HEALTH] Master/4.15 Health Check please don't merge this
Pearl1594 commented on pull request #4131: URL: https://github.com/apache/cloudstack/pull/4131#issuecomment-722183848 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] harikrishna-patnala commented on a change in pull request #4437: [Bug fix] VMware: Fix for SSVM recreation on deployasis systemVM templates
harikrishna-patnala commented on a change in pull request #4437:
URL: https://github.com/apache/cloudstack/pull/4437#discussion_r517822442
##
File path:
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
##
@@ -824,7 +824,7 @@ private DiskProfile allocateTemplatedVolume(Type type,
String name, DiskOffering
int volumesNumber = 1;
List templateAsIsDisks = null;
String configurationId = null;
-if (template.isDeployAsIs()) {
+if (template.isDeployAsIs() && vm.getType() !=
VirtualMachine.Type.SecondaryStorageVm) {
Review comment:
Thanks for fixing that case @nvazquez
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4442: Preventing port 53 being added as lb rule when dns service is availab…
blueorangutan commented on pull request #4442: URL: https://github.com/apache/cloudstack/pull/4442#issuecomment-722158764 @Spaceman1984 a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4442: Preventing port 53 being added as lb rule when dns service is availab…
Spaceman1984 commented on pull request #4442: URL: https://github.com/apache/cloudstack/pull/4442#issuecomment-722158527 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 closed pull request #4442: Preventing port 53 being added as lb rule when dns service is availab…
Spaceman1984 closed pull request #4442: URL: https://github.com/apache/cloudstack/pull/4442 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 opened a new pull request #4442: Preventing port 53 being added as lb rule when dns service is availab…
Spaceman1984 opened a new pull request #4442: URL: https://github.com/apache/cloudstack/pull/4442 …le in network offering ## Description Throwing an error when port 53 is added to a load balancer when DNS is available on the network service offering. Fixes: #4285 ## Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [x] Bug fix (non-breaking change which fixes an issue) - [ ] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) ## Screenshots (if appropriate): ## How Has This Been Tested? Try to add port 53 as a public port as a load balancer rule, an error will be returned. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4442: Preventing port 53 being added as lb rule when dns service is availab…
blueorangutan commented on pull request #4442: URL: https://github.com/apache/cloudstack/pull/4442#issuecomment-722142691 Packaging result: ✔centos7 ✖centos8 ✔debian. JID-2333 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4401: Preventing port 53 being added as lb rule when dns service is availab…
Spaceman1984 commented on pull request #4401: URL: https://github.com/apache/cloudstack/pull/4401#issuecomment-722135304 Closing in favor of #4442 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 closed pull request #4401: Preventing port 53 being added as lb rule when dns service is availab…
Spaceman1984 closed pull request #4401: URL: https://github.com/apache/cloudstack/pull/4401 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4442: Preventing port 53 being added as lb rule when dns service is availab…
blueorangutan commented on pull request #4442: URL: https://github.com/apache/cloudstack/pull/4442#issuecomment-722135957 @Spaceman1984 a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4442: Preventing port 53 being added as lb rule when dns service is availab…
Spaceman1984 commented on pull request #4442: URL: https://github.com/apache/cloudstack/pull/4442#issuecomment-722135848 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] dukeware opened a new issue #4441: cpvm not support VMware 7.0 console
dukeware opened a new issue #4441: URL: https://github.com/apache/cloudstack/issues/4441 # ISSUE TYPE * Improvement Request # COMPONENT NAME ~~~ CPVM ~~~ # CLOUDSTACK VERSION ~~~ 14.1 ~~~ This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] levindecaro commented on pull request #4373: Handles creation /var/run/cloud folder for creation of lock file while modifyvxlan.sh script is run
levindecaro commented on pull request #4373: URL: https://github.com/apache/cloudstack/pull/4373#issuecomment-722108509 @DaanHoogland I would like to report #4350 fixed create directory issue. thx This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4437: [Bug fix] VMware: Fix for SSVM recreation on deployasis systemVM templates
blueorangutan commented on pull request #4437: URL: https://github.com/apache/cloudstack/pull/4437#issuecomment-721894745 @nvazquez a Trillian-Jenkins test job (centos7 mgmt + vmware-67u3) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on pull request #4437: [Bug fix] VMware: Fix for SSVM recreation on deployasis systemVM templates
nvazquez commented on pull request #4437: URL: https://github.com/apache/cloudstack/pull/4437#issuecomment-721894360 @blueorangutan test centos7 vmware-67u3 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4437: [Bug fix] VMware: Fix for SSVM recreation on deployasis systemVM templates
blueorangutan commented on pull request #4437: URL: https://github.com/apache/cloudstack/pull/4437#issuecomment-721869469 Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2332 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4437: [Bug fix] VMware: Fix for SSVM recreation on deployasis systemVM templates
blueorangutan commented on pull request #4437: URL: https://github.com/apache/cloudstack/pull/4437#issuecomment-721852011 @nvazquez a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on pull request #4437: [Bug fix] VMware: Fix for SSVM recreation on deployasis systemVM templates
nvazquez commented on pull request #4437: URL: https://github.com/apache/cloudstack/pull/4437#issuecomment-721851233 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4329: Adding AutoScaling for cks
blueorangutan commented on pull request #4329: URL: https://github.com/apache/cloudstack/pull/4329#issuecomment-721828319 Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2331 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4329: Adding AutoScaling for cks
blueorangutan commented on pull request #4329: URL: https://github.com/apache/cloudstack/pull/4329#issuecomment-721809568 @Pearl1594 a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] Pearl1594 commented on pull request #4329: Adding AutoScaling for cks
Pearl1594 commented on pull request #4329: URL: https://github.com/apache/cloudstack/pull/4329#issuecomment-721808713 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on a change in pull request #4437: [Bug fix] VMware: Fix for SSVM recreation on deployasis systemVM templates
nvazquez commented on a change in pull request #4437:
URL: https://github.com/apache/cloudstack/pull/4437#discussion_r517435355
##
File path:
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
##
@@ -824,7 +824,7 @@ private DiskProfile allocateTemplatedVolume(Type type,
String name, DiskOffering
int volumesNumber = 1;
List templateAsIsDisks = null;
String configurationId = null;
-if (template.isDeployAsIs()) {
+if (template.isDeployAsIs() && vm.getType() !=
VirtualMachine.Type.SecondaryStorageVm) {
Review comment:
I've pushed a fix to check for running SSVMs in the zone as well
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] nvazquez commented on pull request #4437: [Bug fix] VMware: Fix for SSVM recreation on deployasis systemVM templates
nvazquez commented on pull request #4437: URL: https://github.com/apache/cloudstack/pull/4437#issuecomment-721805953 @blueorangutan package This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] huadream closed issue #3448: Quota calculation is incorrect
huadream closed issue #3448: URL: https://github.com/apache/cloudstack/issues/3448 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] resmo commented on issue #3934: Zones are returned in a random order
resmo commented on issue #3934: URL: https://github.com/apache/cloudstack/issues/3934#issuecomment-721748001 @weizhouapache no, this won't work for me. I am not referring to one single specific installation. I am speaking of the API clients and ansible integration relying on the API to behave predicable and stable, now and in the future. It is not the first time I fixed regressions of the API in API clients and ansible modules. > this issue might exists with template, disk offering, service offering, network offering as well. As a cloudstack apache member, I won't accept we break the API on purpose and let users work around it. The fact, this issue exists not only for zones but for other resources makes it even worse! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] resmo edited a comment on issue #3934: Zones are returned in a random order
resmo edited a comment on issue #3934: URL: https://github.com/apache/cloudstack/issues/3934#issuecomment-721721227 @DaanHoogland well, we have to make the previous optional zone argument a required argument in almost all modules. This will break backwards compatibly, which means we make most likely many users angry. You can call this ""work around" I call it a bad user experience for a bug introduced by cloudstack and which should be fixed by cloudstack and not by its clients or users. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] weizhouapache commented on issue #3934: Zones are returned in a random order
weizhouapache commented on issue #3934: URL: https://github.com/apache/cloudstack/issues/3934#issuecomment-721731075 @resmo this workaround should work for you. ``` UPDATE `cloud`.`data_center` SET `sort_key` = `id` WHERE `sort_key` = 0; ``` this change will break the ordering of zones if users set sort_key to a non-zero value and use sort_key to order zones. so I will not sure if we can merge this change into 4.14.1.0 or 4.15.0.0 this issue might exists with template, disk offering, service offering, network offering as well. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] resmo commented on issue #3934: Zones are returned in a random order
resmo commented on issue #3934: URL: https://github.com/apache/cloudstack/issues/3934#issuecomment-721721227 @DaanHoogland well, we have to make the previous optional zone argument a required argument in almost all modules. This will break backwards compatibly, which means we make most likely many users angry. You can call this ""work around" I call it a bad user experience for a "fix" introduced by cloudstack and which should be fixed by cloudstack and not by its clients or users. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on pull request #4439: Added compress option to dnsmasq log files
rhtyd commented on pull request #4439: URL: https://github.com/apache/cloudstack/pull/4439#issuecomment-721665574 Simple enough change, let's merge for master @DaanHoogland ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329:
URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517248971
##
File path:
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java
##
@@ -380,4 +411,59 @@ protected boolean stateTransitTo(long kubernetesClusterId,
KubernetesCluster.Eve
return false;
}
}
+
+protected boolean createCloudStackSecret(String[] keys) {
+File pkFile = getManagementServerSshPublicKeyFile();
+Pair publicIpSshPort =
getKubernetesClusterServerIpSshPort(null);
+publicIpAddress = publicIpSshPort.first();
+sshPort = publicIpSshPort.second();
+
+try {
+Pair result =
SshHelper.sshExecute(publicIpAddress, sshPort, CLUSTER_NODE_VM_USER,
+pkFile, null, String.format("/opt/bin/deploy-cloudstack-secret
-u '%s' -k '%s' -s '%s'",
Review comment:
@davidjumani - our systemvmtemplate patching also uses `/opt/bin` -->
data iso patching doesn't overwrite any scripts or folders?
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] Spaceman1984 commented on pull request #4401: Preventing port 53 being added as lb rule when dns service is availab…
Spaceman1984 commented on pull request #4401: URL: https://github.com/apache/cloudstack/pull/4401#issuecomment-721652082 Sure @DaanHoogland, I'll try to get to it later today. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on issue #3934: Zones are returned in a random order
DaanHoogland commented on issue #3934: URL: https://github.com/apache/cloudstack/issues/3934#issuecomment-721634888 @resmo @dpassante do you have a fix or work around? it seems to me not a serious issue but please correct me on that. @rhtyd @shwstppr @davidjumani is sort order still used the same way in primate? should the default be -1 instead of 0 for instance? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329: URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517221576 ## File path: tools/appliance/systemvmtemplate/template.json ## @@ -33,11 +33,11 @@ [ "-smp", "1" ] ], "format": "qcow2", - "disk_size": 2500, + "disk_size": 1, "disk_interface": "virtio", "net_device": "virtio-net", - "iso_url": "https://download.cloudstack.org/systemvm/debian/debian-10.5.0-amd64-netinst.iso;, - "iso_checksum": "0a6aee1d9aafc1ed095105c052f9fdd65ed00ea9274188c9cd0072c8e6838ab40e246d45a1e6956d74ef1b04a1fc042151762f25412e9ff0cbf49418eef7992e", + "iso_url": "http://sbjenkins-stagingrepo.jenkins.lon/flatcar/debian-10.6.0-amd64-netinst.iso;, Review comment: Can you fix the url to download.cloudstack.org for 10.6 iso? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on issue #4350: modifyvxlan.sh expect /var/run/cloud directory for LOCK, but directory require manual creation
DaanHoogland commented on issue #4350: URL: https://github.com/apache/cloudstack/issues/4350#issuecomment-721630786 fixed in #4373 can you confirm @levindecaro ? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on issue #4346: SQLIntegrityConstraintViolationException: Duplicate entry 's-190-VM-PremiumSecondaryStorageResource' for key 'guid'
DaanHoogland commented on issue #4346: URL: https://github.com/apache/cloudstack/issues/4346#issuecomment-721629868 sounds like serious but verymuch an edge case. I would expect 1. a ssvm to be removed by the system if it isn't functional 1. a new ssvm to be created with a new id 2. an extra ssvm not to be a problem in a running system. have you relyably reproduced this @borisstoyanov? and can you confirm this is a new issue in current master/4.15? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329: URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517219636 ## File path: tools/appliance/systemvmtemplate/template.json ## @@ -33,11 +33,11 @@ [ "-smp", "1" ] ], "format": "qcow2", - "disk_size": 2500, + "disk_size": 1, Review comment: @Pearl1594 check and match with the preseed partition sizes This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329:
URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517219223
##
File path: tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
##
@@ -70,20 +76,29 @@ function install_packages() {
radvd \
sharutils genisoimage aria2 \
strongswan libcharon-extra-plugins libstrongswan-extra-plugins
strongswan-charon strongswan-starter \
-virt-what open-vm-tools qemu-guest-agent hyperv-daemons
-
- apt-get -y autoremove --purge
- apt-get clean
- apt-get autoclean
+virt-what open-vm-tools qemu-guest-agent hyperv-daemons \
+apt-transport-https ca-certificates curl gnupg gnupg-agent
software-properties-common cloud-init
+ apt_clean
${apt_get} install links
+ curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
+ apt-key fingerprint 0EBFCD88
+
#32 bit architecture support for vhd-util: not required for 32 bit template
if [ "${arch}" != "i386" ]; then
dpkg --add-architecture i386
apt-get update
${apt_get} install libuuid1:i386 libc6:i386
+
+add-apt-repository \
+"deb [arch=amd64] https://download.docker.com/linux/debian \
+$(lsb_release -cs) \
+stable"
+apt-get update
+${apt_get} install docker-ce docker-ce-cli containerd.io
Review comment:
@Pearl1594 check if we can use - `--no-install-recommends `
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329:
URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517217864
##
File path: tools/appliance/systemvmtemplate/http/preseed.cfg
##
@@ -56,13 +56,13 @@ d-i partman-auto/disk string /dev/vda
d-i partman-auto/method string regular
d-i partman-auto/expert_recipe string \
boot-root ::\
- 100 60 100 ext2 \
+ 512 60 512 ext2 \
$primary{ } $bootable{ }\
method{ format } format{ } \
use_filesystem{ } filesystem{ ext2 }\
mountpoint{ /boot } \
. \
- 2240 40 2500 ext4 \
+ 5000 40 1 ext4 \
Review comment:
Note - find the min. disk size and reconfigure this.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on issue #4295: Api Authentication Error
DaanHoogland commented on issue #4295: URL: https://github.com/apache/cloudstack/issues/4295#issuecomment-721627549 Any update @rvalle . is this a bug? is there a milestone to add, or a severity label? tnx This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329:
URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517217704
##
File path: tools/appliance/systemvmtemplate/scripts/cleanup.sh
##
@@ -17,11 +17,10 @@
# under the License.
set -e
-set -x
function cleanup_apt() {
export DEBIAN_FRONTEND=noninteractive
- apt-get -y remove --purge dictionaries-common busybox isc-dhcp-client
isc-dhcp-common \
+ apt-get -y remove --purge dictionaries-common busybox \
Review comment:
@Pearl1594 - can you check if there are anything else that could be
purged ? (due to docker etc dependencies)
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329: URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517214885 ## File path: systemvm/debian/opt/cloud/bin/setup/postinit.sh ## @@ -33,6 +42,10 @@ then fi fi +if [ "$TYPE" == "CKSNode" ]; then + pkill -9 dhclient Review comment: Note - if we've guarded how to call/run the dhclient, we may not need to do this. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329:
URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517214229
##
File path: systemvm/debian/opt/cloud/bin/setup/CKSNode.sh
##
@@ -0,0 +1,61 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+. /opt/cloud/bin/setup/common.sh
+
+setup_k8s_node() {
+log_it "Setting up k8s node"
+
+# set default ssh port and restart sshd service
+sed -i 's/3922/22/g' /etc/ssh/sshd_config
+
+swapoff -a
+sudo sed -i '/ swap / s/^/#/' /etc/fstab
+log_it "Swap disabled"
+
+log_it "Setting up interfaces"
+setup_common eth0
+setup_system_rfc1918_internal
+
+log_it "Setting up entry in hosts"
+sed -i /$NAME/d /etc/hosts
+echo "$ETH0_IP $NAME" >> /etc/hosts
+
+public_ip=`getPublicIp`
+echo "$public_ip $NAME" >> /etc/hosts
+
+echo "export PATH='$PATH:/opt/bin/'">> ~/.bashrc
+
+disable_rpfilter
+enable_fwding 1
+enable_irqbalance 0
+setup_ntp
+dhclient
Review comment:
note - should we call dhclient with some guarding parameters (timeouts,
no. of retries...)
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329:
URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517213136
##
File path: systemvm/debian/opt/cloud/bin/setup/CKSNode.sh
##
@@ -0,0 +1,61 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+. /opt/cloud/bin/setup/common.sh
+
+setup_k8s_node() {
+log_it "Setting up k8s node"
+
+# set default ssh port and restart sshd service
+sed -i 's/3922/22/g' /etc/ssh/sshd_config
+
+swapoff -a
+sudo sed -i '/ swap / s/^/#/' /etc/fstab
+log_it "Swap disabled"
+
+log_it "Setting up interfaces"
+setup_common eth0
+setup_system_rfc1918_internal
+
+log_it "Setting up entry in hosts"
+sed -i /$NAME/d /etc/hosts
+echo "$ETH0_IP $NAME" >> /etc/hosts
+
+public_ip=`getPublicIp`
+echo "$public_ip $NAME" >> /etc/hosts
+
+echo "export PATH='$PATH:/opt/bin/'">> ~/.bashrc
+
+disable_rpfilter
+enable_fwding 1
+enable_irqbalance 0
+setup_ntp
+dhclient
Review comment:
sudo systemctl disable dhcpcd.service ?
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329: URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517208445 ## File path: engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql ## @@ -833,3 +833,17 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_vers -- Fix OS category for Guest OS 'Other PV Virtio-SCSI (64-bit)' UPDATE `cloud`.`guest_os` SET category_id = 7 WHERE id = 275 AND display_name = 'Other PV Virtio-SCSI (64-bit)'; + +-- TODO : Move to 4.16 +ALTER TABLE `cloud`.`user_vm` ADD COLUMN `user_vm_type` varchar(255) DEFAULT "UserVM" COMMENT 'Defines the type of UserVM'; + +UPDATE `cloud`.`vm_template` set deploy_as_is = 1 where id = 8; Review comment: Explore - For existing env which has gone through an upgrade, we want to handle it in the java upgrade path by checking the registered template and setting the deploy_as_is to true. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] shwstppr commented on a change in pull request #4329: Adding AutoScaling for cks
shwstppr commented on a change in pull request #4329:
URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517160205
##
File path:
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java
##
@@ -261,60 +269,6 @@ private void logAndThrow(final Level logLevel, final
String message, final Excep
logTransitStateAndThrow(logLevel, message, null, null, ex);
}
-private boolean isKubernetesServiceTemplateConfigured(DataCenter zone) {
-// Check Kubernetes VM template for zone
-boolean isHyperVAvailable = false;
-boolean isKVMAvailable = false;
-boolean isVMwareAvailable = false;
-boolean isXenserverAvailable = false;
-List clusters = clusterDao.listByZoneId(zone.getId());
-for (ClusterVO clusterVO : clusters) {
-if
(Hypervisor.HypervisorType.Hyperv.equals(clusterVO.getHypervisorType())) {
-isHyperVAvailable = true;
-}
-if
(Hypervisor.HypervisorType.KVM.equals(clusterVO.getHypervisorType())) {
-isKVMAvailable = true;
-}
-if
(Hypervisor.HypervisorType.VMware.equals(clusterVO.getHypervisorType())) {
-isVMwareAvailable = true;
-}
-if
(Hypervisor.HypervisorType.XenServer.equals(clusterVO.getHypervisorType())) {
-isXenserverAvailable = true;
-}
-}
-List> templatePairs = new ArrayList<>();
-if (isHyperVAvailable) {
-templatePairs.add(new
Pair<>(KubernetesClusterHyperVTemplateName.key(),
KubernetesClusterHyperVTemplateName.value()));
-}
-if (isKVMAvailable) {
Review comment:
@Pearl1594 have we put any check or something for people who will
upgrade to 4.16 and have existing k8s cluster? They try to scale their cluster
cc @davidjumani
##
File path: tools/appliance/systemvmtemplate/template.json
##
@@ -33,11 +33,11 @@
[ "-smp", "1" ]
],
"format": "qcow2",
- "disk_size": 2500,
+ "disk_size": 1,
"disk_interface": "virtio",
"net_device": "virtio-net",
- "iso_url":
"https://download.cloudstack.org/systemvm/debian/debian-10.5.0-amd64-netinst.iso;,
- "iso_checksum":
"0a6aee1d9aafc1ed095105c052f9fdd65ed00ea9274188c9cd0072c8e6838ab40e246d45a1e6956d74ef1b04a1fc042151762f25412e9ff0cbf49418eef7992e",
+ "iso_url":
"http://sbjenkins-stagingrepo.jenkins.lon/flatcar/debian-10.6.0-amd64-netinst.iso;,
Review comment:
@Pearl1594 @davidjumani you don't need to to put this link here. It can
be set in Trillian override code.
##
File path: server/src/main/java/com/cloud/vm/UserVmManager.java
##
@@ -55,6 +55,10 @@
static final int MAX_USER_DATA_LENGTH_BYTES = 2048;
+public static enum UserVmType {
+CKSNode
+}
Review comment:
Don't we need to have some default type?
##
File path: tools/marvin/marvin/config/test_data.py
##
@@ -2036,46 +2030,11 @@
},
"1.16.3": {
"semanticversion": "1.16.3",
-"url": "http://download.cloudstack.org/cks/setup-1.16.3.iso;,
+"url":
"http://sbjenkins-stagingrepo.jenkins.lon/cks/binaries-iso/as-1.16.3.iso;,
Review comment:
@Pearl1594 @davidjumani you don't need to to put this link here. It can
be set in Trillian override code.
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329: URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517206804 ## File path: engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql ## @@ -833,3 +833,17 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_vers -- Fix OS category for Guest OS 'Other PV Virtio-SCSI (64-bit)' UPDATE `cloud`.`guest_os` SET category_id = 7 WHERE id = 275 AND display_name = 'Other PV Virtio-SCSI (64-bit)'; + +-- TODO : Move to 4.16 +ALTER TABLE `cloud`.`user_vm` ADD COLUMN `user_vm_type` varchar(255) DEFAULT "UserVM" COMMENT 'Defines the type of UserVM'; + +UPDATE `cloud`.`vm_template` set deploy_as_is = 1 where id = 8; Review comment: Add a comment to explain why this is done. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329: URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517205707 ## File path: engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql ## @@ -833,3 +833,17 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_vers -- Fix OS category for Guest OS 'Other PV Virtio-SCSI (64-bit)' UPDATE `cloud`.`guest_os` SET category_id = 7 WHERE id = 275 AND display_name = 'Other PV Virtio-SCSI (64-bit)'; + +-- TODO : Move to 4.16 Review comment: Note - we need to move it to a 4.15->4.16 path in future. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd commented on a change in pull request #4329: Adding AutoScaling for cks
rhtyd commented on a change in pull request #4329:
URL: https://github.com/apache/cloudstack/pull/4329#discussion_r517204970
##
File path:
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41400to41500.java
##
@@ -140,9 +140,9 @@ private void updateSystemVmTemplates(final Connection conn)
{
final Map newTemplateChecksum = new
HashMap() {
{
-put(Hypervisor.HypervisorType.KVM,
"81b3e48bb934784a13555a43c5ef5ffb");
-put(Hypervisor.HypervisorType.XenServer,
"1b178a5dbdbe09015340144c6017");
-put(Hypervisor.HypervisorType.VMware,
"e6a88e518c57d6f36c096c4204c3417f");
+put(Hypervisor.HypervisorType.KVM,
"0d95bb3d9385097dec8b485e46eae34b");
Review comment:
Note: after 4.15 is cut; we need to create a new upgrade path from
4.15->4.16 and move these there. cc @Pearl1594
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on issue #3448: Quota calculation is incorrect
DaanHoogland commented on issue #3448: URL: https://github.com/apache/cloudstack/issues/3448#issuecomment-721616693 @huadream have you issues with this and a workaround? nobody else complains about this, so either no one uses quota or it is failing only for you. As you have pinpointed the issue in code, can you submit a PR for fixing it? or alternatively do you think we can close this issue? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4141: [New feature] Load balancer customization (haproxy-based)
blueorangutan commented on pull request #4141: URL: https://github.com/apache/cloudstack/pull/4141#issuecomment-721612964 @DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #4141: [New feature] Load balancer customization (haproxy-based)
DaanHoogland commented on pull request #4141: URL: https://github.com/apache/cloudstack/pull/4141#issuecomment-721612271 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan removed a comment on pull request #4141: [New feature] Load balancer customization (haproxy-based)
blueorangutan removed a comment on pull request #4141: URL: https://github.com/apache/cloudstack/pull/4141#issuecomment-721596004 @DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] rhtyd removed a comment on pull request #4141: [New feature] Load balancer customization (haproxy-based)
rhtyd removed a comment on pull request #4141: URL: https://github.com/apache/cloudstack/pull/4141#issuecomment-720349041 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland removed a comment on pull request #4141: [New feature] Load balancer customization (haproxy-based)
DaanHoogland removed a comment on pull request #4141: URL: https://github.com/apache/cloudstack/pull/4141#issuecomment-721595255 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan removed a comment on pull request #4141: [New feature] Load balancer customization (haproxy-based)
blueorangutan removed a comment on pull request #4141: URL: https://github.com/apache/cloudstack/pull/4141#issuecomment-720349355 @rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on issue #2996: [Bug Report] - GRE Isolation Broken in VPC Tier
DaanHoogland commented on issue #2996: URL: https://github.com/apache/cloudstack/issues/2996#issuecomment-721600984 moving it back to the milestone @rhtyd @PaulAngus @andrijapanicsb > @andrijapanicsb IIRC no one on the list was familiar with the GRE component. I don't think the issue should be closed. Either the feature needs to be fixed or removed with documentation being updated. I don't think moving the milestone makes sense if no one plans to work on it. I have not yet had time to pick this up and do the research. what I read here is that we should remove the documentation part for GRE. (cc @bdonnahue) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #4141: [New feature] Load balancer customization (haproxy-based)
blueorangutan commented on pull request #4141: URL: https://github.com/apache/cloudstack/pull/4141#issuecomment-721596004 @DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #4141: [New feature] Load balancer customization (haproxy-based)
DaanHoogland commented on pull request #4141: URL: https://github.com/apache/cloudstack/pull/4141#issuecomment-721595255 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #3997: New API endpoint: UpdateVlanIpRange
DaanHoogland commented on pull request #3997: URL: https://github.com/apache/cloudstack/pull/3997#issuecomment-721594480 @PaulAngus this is API and DB only and has beenn around for a long time. Can we consider putting it in? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a change in pull request #3997: New API endpoint: UpdateVlanIpRange
DaanHoogland commented on a change in pull request #3997:
URL: https://github.com/apache/cloudstack/pull/3997#discussion_r517174628
##
File path:
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
##
@@ -4075,6 +4079,151 @@ public VlanVO doInTransaction(final TransactionStatus
status) {
}
+@Override
+public Vlan updateVlanAndPublicIpRange(UpdateVlanIpRangeCmd cmd) throws
ConcurrentOperationException,
+ResourceUnavailableException,ResourceAllocationException {
+
+return updateVlanAndPublicIpRange(cmd.getId(),
cmd.getStartIp(),cmd.getEndIp(),
+cmd.getGateway(),cmd.getNetmask());
+}
+
+@DB
+@ActionEvent(eventType = EventTypes.EVENT_VLAN_IP_RANGE_UPDATE,
eventDescription = "update vlan ip Range", async
+= false)
+public Vlan updateVlanAndPublicIpRange(final long id, String startIp,
+ String endIp,
+ String gateway,
+ String netmask) throws
ConcurrentOperationException {
+
+VlanVO vlanRange = _vlanDao.findById(id);
+if (vlanRange == null) {
+throw new InvalidParameterValueException("Please specify a valid
IP range id.");
+}
+
+if (gateway == null) {
+gateway = vlanRange.getVlanGateway();
+}
+
+if (netmask == null) {
+netmask = vlanRange.getVlanNetmask();
+}
+
+final String[] existingVlanIPRangeArray =
vlanRange.getIpRange().split("-");
+final String currentStartIP = existingVlanIPRangeArray[0];
+final String currentEndIP = existingVlanIPRangeArray [1];
+
+if(startIp == null) {
+startIp = currentStartIP;
+}
+
+if(endIp == null) {
+endIp = currentEndIP;
+}
+
+final List ips = _publicIpAddressDao.listByVlanId(id);
+checkAllocatedIpsAreWithinVlanRange(ips,startIp,endIp);
+
+final String cidr = NetUtils.ipAndNetMaskToCidr(gateway, netmask);
+final String cidrAddress = getCidrAddress(cidr);
+final long cidrSize = getCidrSize(cidr);
+
+checkIpRange(currentStartIP,currentEndIP,cidrAddress,cidrSize);
+
+checkIpRange(startIp, endIp, cidrAddress, cidrSize);
+
+checkGatewayOverlap(startIp,endIp,gateway);
+
+VlanVO range;
+try {
+final String newStartIP = startIp;
+final String newEndIP = endIp;
+
+range = _vlanDao.acquireInLockTable(id, 30);
+if (range == null) {
+throw new CloudRuntimeException("Unable to acquire vlan
configuration: " + id);
+}
+
+if (s_logger.isDebugEnabled()) {
+s_logger.debug("lock vlan " + id + " is acquired");
+}
+
+commitUpdateVlanAndIpRange(id, newStartIP, newEndIP,
currentStartIP, currentEndIP,true);
+
+} catch (final Exception e) {
+s_logger.error("Unable to edit VlanRange due to " +
e.getMessage(), e);
+throw new CloudRuntimeException("Failed to edit VlanRange. Please
contact Cloud Support.");
+} finally {
+_vlanDao.releaseFromLockTable(id);
+}
+
+return vlanRange;
+}
+private VlanVO commitUpdateVlanAndIpRange(final Long id, final String
newStartIP, final String newEndIP,final String currentStartIP, final String
currentEndIP, final boolean ipv4) {
Review comment:
```suggestion
}
private VlanVO commitUpdateVlanAndIpRange(final Long id, final String
newStartIP, final String newEndIP,final String currentStartIP, final String
currentEndIP, final boolean ipv4) {
```
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[cloudstack] branch master updated (fdafc3c -> ffc42b9)
This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git. from fdafc3c deps: fix pbm url download (#4440) add 3414656 FIX issue in VR if remote access vpn is enabled (#4430) add ffc42b9 Merge branch '4.14' No new revisions were added by this update. Summary of changes: systemvm/debian/opt/cloud/bin/configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cloudstack] branch 4.14 updated: FIX issue in VR if remote access vpn is enabled (#4430)
This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch 4.14 in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/4.14 by this push: new 3414656 FIX issue in VR if remote access vpn is enabled (#4430) 3414656 is described below commit 34146569d993720c5462537234efc9b4ac4a7ce2 Author: Rakesh AuthorDate: Wed Nov 4 09:27:48 2020 +0100 FIX issue in VR if remote access vpn is enabled (#4430) Co-authored-by: Rakesh Venkatesh --- systemvm/debian/opt/cloud/bin/configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemvm/debian/opt/cloud/bin/configure.py b/systemvm/debian/opt/cloud/bin/configure.py index fc846af..5d60fab 100755 --- a/systemvm/debian/opt/cloud/bin/configure.py +++ b/systemvm/debian/opt/cloud/bin/configure.py @@ -755,7 +755,7 @@ class CsRemoteAccessVpn(CsDataBag): self.fw.append(["", "", "-A INPUT -i ppp+ -m udp -p udp --dport 53 -j ACCEPT"]) self.fw.append(["", "", "-A INPUT -i ppp+ -m tcp -p tcp --dport 53 -j ACCEPT"]) -self.fw.append(["nat", "", "-I PREROUTING -i ppp+ -m tcp --dport 53 -j DNAT --to-destination %s" % local_ip]) +self.fw.append(["nat", "", "-I PREROUTING -i ppp+ -p tcp -m tcp --dport 53 -j DNAT --to-destination %s" % local_ip]) if self.config.is_vpc(): return
[GitHub] [cloudstack] DaanHoogland merged pull request #4430: FIX issue in VR if remote access vpn is enabled
DaanHoogland merged pull request #4430: URL: https://github.com/apache/cloudstack/pull/4430 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #4418: Create Event in case of OOBM failure
DaanHoogland commented on pull request #4418: URL: https://github.com/apache/cloudstack/pull/4418#issuecomment-721583824 @PaulAngus can we put this in for 4.15? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #4401: Preventing port 53 being added as lb rule when dns service is availab…
DaanHoogland commented on pull request #4401: URL: https://github.com/apache/cloudstack/pull/4401#issuecomment-721583109 @Spaceman1984 can you rebase on 4.14? This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
