Cleanup + set vmware systemvm template deploy_as_is to 1

Pearl Dsilva · Pearl Dsilva · commit 31ad3c26983f · 2020-10-29T17:35:50.000+05:30
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql b/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql
@@ -828,9 +828,4 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_vers
 
 ALTER TABLE `cloud`.`user_vm` ADD COLUMN `user_vm_type` varchar(255) DEFAULT "UserVM" COMMENT 'Defines the type of UserVM';
 
----- Use 'Other Linux 64-bit' as guest os for the default systemvmtemplate for XenServer
---UPDATE `cloud`.`vm_template` SET guest_os_id=293 WHERE id=1;
---
----- Use 'Other Linux 64-bit' as guest os for the default systemvmtemplate for VMware
----- This fixes a memory allocation issue to systemvms on VMware/ESXi
---UPDATE `cloud`.`vm_template` SET guest_os_id=293 WHERE id=8;
+UPDATE `cloud`.`vm_template` set deploy_as_is = 1 where id = 8;
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1555,7 +1555,6 @@ private boolean checkOvsNetwork(final String networkName) {
     }
 
     public boolean passCmdLine(final String vmName, final String cmdLine) throws InternalErrorException {
-        s_logger.info("PASSING CMDLINE DATA: vm-name "+ vmName);
         final Script command = new Script(_patchScriptPath, 300 * 1000, s_logger);
         String result;
         command.add("-n", vmName);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtStartCommandWrapper.java
@@ -90,6 +90,13 @@ public Answer execute(final StartCommand command, final LibvirtComputingResource
             // pass cmdline info to system vms
             if (vmSpec.getType() != VirtualMachine.Type.User || (vmSpec.getBootArgs() != null && vmSpec.getBootArgs().contains("CKSNode"))) {
                 // try to patch and SSH into the systemvm for up to 5 minutes
+                for (int count = 0; count < 10; count++) {
+                    // wait and try passCmdLine for 30 seconds at most for CLOUDSTACK-2823
+                    if (libvirtComputingResource.passCmdLine(vmName, vmSpec.getBootArgs())) {
+                        break;
+                    }
+                }
+
                 if (vmSpec.getType() != VirtualMachine.Type.User) {
                     String controlIp = null;
                     for (final NicTO nic : vmSpec.getNics()) {
@@ -99,13 +106,6 @@ public Answer execute(final StartCommand command, final LibvirtComputingResource
                         }
                     }
 
-                    for (int count = 0; count < 10; count++) {
-                        // wait and try passCmdLine for 30 seconds at most for CLOUDSTACK-2823
-                        if (libvirtComputingResource.passCmdLine(vmName, vmSpec.getBootArgs())) {
-                            break;
-                        }
-                    }
-
                     final VirtualRoutingResource virtRouterResource = libvirtComputingResource.getVirtRouterResource();
                     // check if the router is up?
                     for (int count = 0; count < 60; count++) {
@@ -115,14 +115,6 @@ public Answer execute(final StartCommand command, final LibvirtComputingResource
                         }
                     }
                 }
-                if (vmSpec.getBootArgs() != null && vmSpec.getBootArgs().contains("CKSNode")) {
-                    for (int count = 0; count < 10; count++) {
-                        // wait and try passCmdLine for 30 seconds at most for CLOUDSTACK-2823
-                        if (libvirtComputingResource.passCmdLine(vmName, vmSpec.getBootArgs())) {
-                            break;
-                        }
-                    }
-                }
             }
 
             state = DomainState.VIR_DOMAIN_RUNNING;
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2252,7 +2252,6 @@ protected StartAnswer execute(StartCommand cmd) {
                         }
 
                         if (!StringUtils.isBlank(vmSpec.getBootArgs())) {
-                            s_logger.info("bootargs vmware = "+ vmSpec.getBootArgs());
                             String newMacSequence = generateMacSequence(nics);
                             vmSpec.setBootArgs(replaceNicsMacSequenceInBootArgs(oldMacSequence, newMacSequence, vmSpec));
                         }
@@ -2815,7 +2814,6 @@ protected String generateMacSequence(NicTO[] nics) {
     protected String replaceNicsMacSequenceInBootArgs(String oldMacSequence, String newMacSequence, VirtualMachineTO vmSpec) {
         String bootArgs = vmSpec.getBootArgs();
         if (!StringUtils.isBlank(bootArgs) && !StringUtils.isBlank(oldMacSequence) && !StringUtils.isBlank(newMacSequence)) {
-            s_logger.info("bootargs replacing nic mac address = "+ oldMacSequence +" " + newMacSequence);
             return bootArgs.replace(oldMacSequence, newMacSequence);
         }
         return "";
diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java
@@ -197,7 +197,7 @@ protected void logTransitStateDetachIsoAndThrow(final Level logLevel, final Stri
 
     protected void deleteTemplateLaunchPermission() {
         if (clusterTemplate != null && owner != null) {
-            LOGGER.info("Removing launch permission for systemVM template");
+            LOGGER.info("Revoking launch permission for systemVM template");
             launchPermissionDao.removePermissions(clusterTemplate.getId(), Collections.singletonList(owner.getId()));
         }
     }
diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-master-add.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-master-add.yml
@@ -99,7 +99,6 @@ write_files:
         cp -a ${BINARIES_DIR}/k8s/{kubeadm,kubelet,kubectl} .
         chmod +x {kubeadm,kubelet,kubectl}
 
-        # bash -x /opt/bin/k8s-node-setup.sh
         sed "s:/usr/bin:/opt/bin:g" ${BINARIES_DIR}/kubelet.service > /etc/systemd/system/kubelet.service
         mkdir -p /etc/systemd/system/kubelet.service.d
         sed "s:/usr/bin:/opt/bin:g" ${BINARIES_DIR}/10-kubeadm.conf > /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml
@@ -230,4 +230,4 @@ write_files:
 
 runcmd:
   - [ systemctl, start, setup-kube-system ]
-  - [ systemctl, start, deploy-kube-system ]
+  - [ systemctl, start, deploy-kube-system ]
diff --git a/scripts/vm/hypervisor/kvm/patch.sh b/scripts/vm/hypervisor/kvm/patch.sh
@@ -17,7 +17,6 @@
 # under the License.
 
 set -e
-set -x
 
 # Get the VM name and cmdline
 while getopts "n:c:h" opt; do
diff --git a/systemvm/debian/opt/cloud/bin/setup/CKSNode.sh b/systemvm/debian/opt/cloud/bin/setup/CKSNode.sh
@@ -16,8 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set -x
-
 . /opt/cloud/bin/setup/common.sh
 
 setup_k8s_node() {
diff --git a/systemvm/debian/opt/cloud/bin/setup/bootstrap.sh b/systemvm/debian/opt/cloud/bin/setup/bootstrap.sh
@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set -x
 PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 CMDLINE=/var/cache/cloud/cmdline
 
diff --git a/systemvm/debian/opt/cloud/bin/setup/common.sh b/systemvm/debian/opt/cloud/bin/setup/common.sh
@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set -x
 PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 
 . /lib/lsb/init-functions
diff --git a/systemvm/debian/opt/cloud/bin/setup/postinit.sh b/systemvm/debian/opt/cloud/bin/setup/postinit.sh
@@ -18,8 +18,6 @@
 #
 # This scripts before ssh.service but after cloud-early-config
 
-set -x
-
 log_it() {
   echo "$(date) $@" >> /var/log/cloud.log
   log_action_msg "$@"
@@ -28,8 +26,7 @@ log_it() {
 # Eject cdrom if any
 CMDLINE=/var/cache/cloud/cmdline
 export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
-if [ "$TYPE" -ne "CKSNode" ]; then
-  log_it "ejecting iso!!!"
+if [ "$TYPE" != "CKSNode" ]; then
   eject || true
 fi
 
diff --git a/tools/appliance/systemvmtemplate/scripts/cleanup.sh b/tools/appliance/systemvmtemplate/scripts/cleanup.sh
@@ -20,7 +20,8 @@ set -e
 
 function cleanup_apt() {
   export DEBIAN_FRONTEND=noninteractive
-  apt-get -y remove --purge dictionaries-common busybox isc-dhcp-client isc-dhcp-common task-english task-ssh-server tasksel tasksel-data laptop-detect wamerican sharutils \
+  apt-get -y remove --purge dictionaries-common busybox isc-dhcp-client isc-dhcp-common \
+    task-english task-ssh-server tasksel tasksel-data laptop-detect wamerican sharutils \
     nano util-linux-locales krb5-locales
 
   apt-get -y autoremove --purge
diff --git a/tools/appliance/systemvmtemplate/scripts/configure_conntrack.sh b/tools/appliance/systemvmtemplate/scripts/configure_conntrack.sh
@@ -34,8 +34,6 @@ function load_conntrack_modules() {
   grep nf_conntrack_ipv4 /etc/modules && return
 
   cat >> /etc/modules << EOF
-nf_conntrack_ipv4
-nf_conntrack_ipv6
 nf_conntrack
 nf_conntrack_ftp
 nf_conntrack_pptp
diff --git a/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh b/tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh
@@ -58,12 +58,8 @@ function configure_cacerts() {
 
 function install_cloud_scripts() {
   # ./cloud_scripts/ has been put there by ../../cloud_scripts_shar_archive.sh
-  echo "installing cloud scripts"
   rsync -av ./cloud_scripts/ /
 
-  ls -lrt
-  ls -lrt /usr/local/cloud/
-
   chmod +x /opt/cloud/bin/* /opt/cloud/bin/setup/* \
     /root/{clearUsageRules.sh,reconfigLB.sh,monitorServices.py} \
     /etc/profile.d/cloud.sh /etc/cron.daily/* /etc/cron.hourly/*
@@ -128,7 +124,7 @@ function configure_services() {
   systemctl disable hyperv-daemons.hv-vss-daemon.service
   systemctl disable qemu-guest-agent
 
-  # Disable docker service
+  # Disable container services
   systemctl disable containerd
   systemctl disable docker.service
   systemctl stop docker.service
diff --git a/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh b/tools/appliance/systemvmtemplate/scripts/install_systemvm_packages.sh
@@ -76,7 +76,8 @@ 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-transport-https ca-certificates curl gnupg  gnupg-agent software-properties-common cloud-init
+    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
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
@@ -2045,42 +2045,6 @@
             "minmemory": 2048
         }
     },
-    "cks_templates": {
-        "kvm": {
-            "name": "Kubernetes-Service-Template-kvm",
-            "displaytext": "Kubernetes-Service-Template kvm",
-            "format": "qcow2",
-            "hypervisor": "kvm",
-            "ostype": "CoreOS",
-            #"url": "http://dl.openvm.eu/cloudstack/coreos/x86_64/coreos_production_cloudstack_image-kvm.qcow2.bz2",
-            "url": "http://sbjenkins-stagingrepo.jenkins.lon/flatcar/systemvmtemplate-kvm.qcow2.bz2",
-            "requireshvm": "True",
-            "ispublic": "True",
-            "isextractable": "True"
-        },
-        "xenserver": {
-            "name": "Kubernetes-Service-Template-xen",
-            "displaytext": "Kubernetes-Service-Template xen",
-            "format": "vhd",
-            "hypervisor": "xenserver",
-            "ostype": "CoreOS",
-            "url": "http://dl.openvm.eu/cloudstack/coreos/x86_64/coreos_production_cloudstack_image-xen.vhd.bz2",
-            "requireshvm": "True",
-            "ispublic": "True",
-            "isextractable": "True"
-        },
-        "vmware": {
-            "name": "Kubernetes-Service-Template-vmware",
-            "displaytext": "Kubernetes-Service-Template vmware",
-            "format": "ova",
-            "hypervisor": "vmware",
-            "ostype": "CoreOS",
-            "url": "http://dl.openvm.eu/cloudstack/coreos/x86_64/coreos_production_cloudstack_image-vmware.ova",
-            "requireshvm": "True",
-            "ispublic": "True",
-            "details": [{"keyboard":"us","nicAdapter":"Vmxnet3","rootDiskController":"pvscsi"}]
-        }
-    },
     "cks_service_offering": {
         "name": "CKS-Instance",
         "displaytext": "CKS Instance",

Original file line number	Diff line number	Diff line change
`@@ -1555,7 +1555,6 @@ private boolean checkOvsNetwork(final String networkName) {`
`1555`	`1555`	`}`
`1556`	`1556`
`1557`	`1557`	`public boolean passCmdLine(final String vmName, final String cmdLine) throws InternalErrorException {`
`1558`		`- s_logger.info("PASSING CMDLINE DATA: vm-name "+ vmName);`
`1559`	`1558`	`final Script command = new Script(_patchScriptPath, 300 * 1000, s_logger);`
`1560`	`1559`	`String result;`
`1561`	`1560`	`command.add("-n", vmName);`
Original file line number	Diff line number	Diff line change
`@@ -2252,7 +2252,6 @@ protected StartAnswer execute(StartCommand cmd) {`
`2252`	`2252`	`}`
`2253`	`2253`
`2254`	`2254`	`if (!StringUtils.isBlank(vmSpec.getBootArgs())) {`
`2255`		`- s_logger.info("bootargs vmware = "+ vmSpec.getBootArgs());`
`2256`	`2255`	`String newMacSequence = generateMacSequence(nics);`
`2257`	`2256`	`vmSpec.setBootArgs(replaceNicsMacSequenceInBootArgs(oldMacSequence, newMacSequence, vmSpec));`
`2258`	`2257`	`}`
`@@ -2815,7 +2814,6 @@ protected String generateMacSequence(NicTO[] nics) {`
`2815`	`2814`	`protected String replaceNicsMacSequenceInBootArgs(String oldMacSequence, String newMacSequence, VirtualMachineTO vmSpec) {`
`2816`	`2815`	`String bootArgs = vmSpec.getBootArgs();`
`2817`	`2816`	`if (!StringUtils.isBlank(bootArgs) && !StringUtils.isBlank(oldMacSequence) && !StringUtils.isBlank(newMacSequence)) {`
`2818`		`- s_logger.info("bootargs replacing nic mac address = "+ oldMacSequence +" " + newMacSequence);`
`2819`	`2817`	`return bootArgs.replace(oldMacSequence, newMacSequence);`
`2820`	`2818`	`}`
`2821`	`2819`	`return "";`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ protected void logTransitStateDetachIsoAndThrow(final Level logLevel, final Stri`
`197`	`197`
`198`	`198`	`protected void deleteTemplateLaunchPermission() {`
`199`	`199`	`if (clusterTemplate != null && owner != null) {`
`200`		`- LOGGER.info("Removing launch permission for systemVM template");`
	`200`	`+ LOGGER.info("Revoking launch permission for systemVM template");`
`201`	`201`	`launchPermissionDao.removePermissions(clusterTemplate.getId(), Collections.singletonList(owner.getId()));`
`202`	`202`	`}`
`203`	`203`	`}`