mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge remote-tracking branch 'origin/4.12'
This commit is contained in:
Rohit Yadav
commit
2aa4842a94
42
.travis.yml
42
.travis.yml
@ -107,28 +107,30 @@ env:
|
||||
smoke/test_volumes
|
||||
smoke/test_vpc_redundant
|
||||
smoke/test_vpc_router_nics
|
||||
smoke/test_vpc_vpn
|
||||
smoke/misc/test_deploy_vm
|
||||
smoke/test_vpc_vpn"
|
||||
|
||||
- TESTS="smoke/misc/test_deploy_vm
|
||||
smoke/misc/test_escalations_templates
|
||||
smoke/misc/test_vm_ha
|
||||
smoke/misc/test_vm_sync"
|
||||
|
||||
- TESTS="component/find_hosts_for_migration
|
||||
smoke/misc/test_vm_sync
|
||||
component/find_hosts_for_migration
|
||||
component/test_acl_isolatednetwork_delete
|
||||
component/test_acl_listsnapshot
|
||||
component/test_acl_listvm
|
||||
component/test_acl_listvolume
|
||||
component/test_acl_sharednetwork"
|
||||
component/test_acl_listvolume"
|
||||
|
||||
- TESTS="component/test_allocation_states
|
||||
component/test_acl_sharednetwork_deployVM-impersonation
|
||||
component/test_affinity_groups_projects
|
||||
component/test_cpu_domain_limits
|
||||
component/test_cpu_limits"
|
||||
- TESTS="component/test_acl_sharednetwork
|
||||
component/test_acl_sharednetwork_deployVM-impersonation"
|
||||
|
||||
- TESTS="component/test_cpu_max_limits
|
||||
component/test_cpu_project_limits
|
||||
component/test_deploy_vm_userdata_multi_nic
|
||||
- TESTS="component/test_affinity_groups_projects
|
||||
component/test_allocation_states"
|
||||
|
||||
- TESTS="component/test_cpu_domain_limits
|
||||
component/test_cpu_limits
|
||||
component/test_cpu_max_limits
|
||||
component/test_cpu_project_limits"
|
||||
|
||||
- TESTS="component/test_deploy_vm_userdata_multi_nic
|
||||
component/test_egress_fw_rules
|
||||
component/test_invalid_gw_nm
|
||||
component/test_ip_reservation
|
||||
@ -137,16 +139,18 @@ env:
|
||||
- TESTS="component/test_memory_limits
|
||||
component/test_mm_domain_limits
|
||||
component/test_mm_max_limits
|
||||
component/test_mm_project_limits
|
||||
component/test_network_offering
|
||||
component/test_mm_project_limits"
|
||||
|
||||
- TESTS="component/test_network_offering
|
||||
component/test_non_contiguous_vlan
|
||||
component/test_persistent_networks"
|
||||
|
||||
- TESTS="component/test_project_limits
|
||||
component/test_project_configs
|
||||
component/test_project_usage
|
||||
component/test_project_resources
|
||||
component/test_regions_accounts
|
||||
component/test_project_resources"
|
||||
|
||||
- TESTS="component/test_regions_accounts
|
||||
component/test_routers
|
||||
component/test_snapshots
|
||||
component/test_stopped_vm"
|
||||
|
||||
@ -1391,7 +1391,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
|
||||
}
|
||||
|
||||
public boolean passCmdLine(final String vmName, final String cmdLine) throws InternalErrorException {
|
||||
final Script command = new Script(_patchScriptPath, 30 * 1000, s_logger);
|
||||
final Script command = new Script(_patchScriptPath, 300 * 1000, s_logger);
|
||||
String result;
|
||||
command.add("-n", vmName);
|
||||
command.add("-c", cmdLine);
|
||||
|
||||
@ -118,9 +118,14 @@ public final class LibvirtStartCommandWrapper extends CommandWrapper<StartComman
|
||||
// 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
|
||||
libvirtComputingResource.passCmdLine(vmName, vmSpec.getBootArgs());
|
||||
// check router is up?
|
||||
final VirtualRoutingResource virtRouterResource = libvirtComputingResource.getVirtRouterResource();
|
||||
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++) {
|
||||
final boolean result = virtRouterResource.connect(controlIp, 1, 5000);
|
||||
if (result) {
|
||||
break;
|
||||
|
||||
@ -16,13 +16,12 @@
|
||||
// under the License.
|
||||
package com.cloud.server;
|
||||
|
||||
import java.io.DataInputStream;
|
||||
import java.io.EOFException;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
@ -608,29 +607,23 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
|
||||
// FIXME: take a global database lock here for safety.
|
||||
boolean onWindows = isOnWindows();
|
||||
if(!onWindows) {
|
||||
Script.runSimpleBashScript("if [ -f " + privkeyfile + " ]; then rm -f " + privkeyfile + "; fi; ssh-keygen -t rsa -N '' -f " + privkeyfile + " -q");
|
||||
Script.runSimpleBashScript("if [ -f " + privkeyfile + " ]; then rm -f " + privkeyfile + "; fi; ssh-keygen -t rsa -m PEM -N '' -f " + privkeyfile + " -q 2>/dev/null || ssh-keygen -t rsa -N '' -f " + privkeyfile + " -q");
|
||||
}
|
||||
|
||||
byte[] arr1 = new byte[4094]; // configuration table column value size
|
||||
try (DataInputStream dis = new DataInputStream(new FileInputStream(privkeyfile))) {
|
||||
dis.readFully(arr1);
|
||||
} catch (EOFException e) {
|
||||
s_logger.info("[ignored] eof reached");
|
||||
} catch (Exception e) {
|
||||
final String privateKey;
|
||||
final String publicKey;
|
||||
try {
|
||||
privateKey = new String(Files.readAllBytes(privkeyfile.toPath()));
|
||||
} catch (IOException e) {
|
||||
s_logger.error("Cannot read the private key file", e);
|
||||
throw new CloudRuntimeException("Cannot read the private key file");
|
||||
}
|
||||
String privateKey = new String(arr1).trim();
|
||||
byte[] arr2 = new byte[4094]; // configuration table column value size
|
||||
try (DataInputStream dis = new DataInputStream(new FileInputStream(pubkeyfile))) {
|
||||
dis.readFully(arr2);
|
||||
} catch (EOFException e) {
|
||||
s_logger.info("[ignored] eof reached");
|
||||
} catch (Exception e) {
|
||||
s_logger.warn("Cannot read the public key file", e);
|
||||
try {
|
||||
publicKey = new String(Files.readAllBytes(pubkeyfile.toPath()));
|
||||
} catch (IOException e) {
|
||||
s_logger.error("Cannot read the public key file", e);
|
||||
throw new CloudRuntimeException("Cannot read the public key file");
|
||||
}
|
||||
String publicKey = new String(arr2).trim();
|
||||
|
||||
final String insertSql1 =
|
||||
"INSERT INTO `cloud`.`configuration` (category, instance, component, name, value, description) " +
|
||||
|
||||
199
systemvm/debian/opt/cloud/bin/setup/bootstrap.sh
Executable file
199
systemvm/debian/opt/cloud/bin/setup/bootstrap.sh
Executable file
@ -0,0 +1,199 @@
|
||||
#!/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.
|
||||
|
||||
PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
|
||||
CMDLINE=/var/cache/cloud/cmdline
|
||||
|
||||
. /lib/lsb/init-functions
|
||||
|
||||
log_it() {
|
||||
echo "$(date) $@" >> /var/log/cloud.log
|
||||
log_action_msg "$@"
|
||||
}
|
||||
|
||||
hypervisor() {
|
||||
if [ -d /proc/xen ]; then
|
||||
mount -t xenfs none /proc/xen
|
||||
$(dmesg | grep -q "Xen HVM")
|
||||
if [ $? -eq 0 ]; then # 1=PV,0=HVM
|
||||
echo "xen-hvm" && return 0
|
||||
else
|
||||
echo "xen-pv" && return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
[ -x /usr/sbin/virt-what ] && local facts=( $(virt-what) )
|
||||
if [ "$facts" != "" ]; then
|
||||
# Xen HVM is recognized as Hyperv when Viridian extensions are enabled
|
||||
if [ "${facts[-1]}" == "xen-domU" ] && [ "${facts[0]}" == "hyperv" ]; then
|
||||
echo "xen-hvm" && return 0
|
||||
else
|
||||
echo ${facts[-1]} && return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
grep -q QEMU /proc/cpuinfo && echo "kvm" && return 0
|
||||
grep -q QEMU /var/log/messages && echo "kvm" && return 0
|
||||
|
||||
vmware-checkvm &> /dev/null && echo "vmware" && return 0
|
||||
|
||||
echo "unknown" && return 1
|
||||
}
|
||||
|
||||
config_guest() {
|
||||
if [ "$HYPERVISOR" == "kvm" ]
|
||||
then
|
||||
# Configure hot-plug
|
||||
modprobe acpiphp || true
|
||||
modprobe pci_hotplug || true
|
||||
sed -i -e "/^s0:2345:respawn.*/d" /etc/inittab
|
||||
sed -i -e "/6:23:respawn/a\s0:2345:respawn:/sbin/getty -L 115200 ttyS0 vt102" /etc/inittab
|
||||
fi
|
||||
[ ! -d /proc/xen ] && sed -i 's/^vc/#vc/' /etc/inittab && telinit q
|
||||
[ -d /proc/xen ] && sed -i 's/^#vc/vc/' /etc/inittab && telinit q
|
||||
}
|
||||
|
||||
get_boot_params() {
|
||||
case $HYPERVISOR in
|
||||
xen-pv|xen-domU)
|
||||
cat /proc/cmdline > $CMDLINE
|
||||
sed -i "s/%/ /g" $CMDLINE
|
||||
;;
|
||||
xen-hvm)
|
||||
if [ ! -f /usr/bin/xenstore-read ]; then
|
||||
log_it "ERROR: xentools not installed, cannot found xenstore-read" && exit 5
|
||||
fi
|
||||
/usr/bin/xenstore-read vm-data/cloudstack/init > $CMDLINE
|
||||
sed -i "s/%/ /g" $CMDLINE
|
||||
;;
|
||||
kvm)
|
||||
systemctl enable --now qemu-guest-agent
|
||||
# Wait for $CMDLINE file to be written by the qemu-guest-agent
|
||||
for i in {1..60}; do
|
||||
if [ -s $CMDLINE ]; then
|
||||
log_it "Received a new non-empty cmdline file from qemu-guest-agent"
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
if [ ! -s $CMDLINE ]; then
|
||||
log_it "Failed to receive the cmdline file via the qemu-guest-agent"
|
||||
fi
|
||||
;;
|
||||
vmware)
|
||||
vmtoolsd --cmd 'machine.id.get' > $CMDLINE
|
||||
;;
|
||||
virtualpc|hyperv)
|
||||
# Hyper-V is recognized as virtualpc hypervisor type. Boot args are passed using KVP Daemon
|
||||
#waiting for the hv_kvp_daemon to start up
|
||||
#sleep need to fix the race condition of hv_kvp_daemon and cloud-early-config
|
||||
[ -f /usr/sbin/hv_kvp_daemon ] && /usr/sbin/hv_kvp_daemon
|
||||
sleep 5
|
||||
cp -f /var/opt/hyperv/.kvp_pool_0 $CMDLINE
|
||||
cat /dev/null > /var/opt/hyperv/.kvp_pool_0
|
||||
;;
|
||||
virtualbox)
|
||||
# Virtualbox is used to test the virtual router
|
||||
# get the commandline from a dmistring (yes, hacky!)
|
||||
dmidecode | grep cmdline | sed 's/^.*cmdline://' > $CMDLINE
|
||||
RV=$?
|
||||
if [ $RV -ne 0 ] ; then
|
||||
log_it "Failed to get cmdline from a virtualbox dmi property"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
get_systemvm_type() {
|
||||
export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
|
||||
}
|
||||
|
||||
|
||||
patch_systemvm() {
|
||||
local patchfile=$1
|
||||
local backupfolder="/tmp/.conf.backup"
|
||||
local logfile="/var/log/patchsystemvm.log"
|
||||
if [ -f /usr/local/cloud/systemvm/conf/cloud.jks ]; then
|
||||
rm -fr $backupfolder
|
||||
mkdir -p $backupfolder
|
||||
cp -r /usr/local/cloud/systemvm/conf/* $backupfolder/
|
||||
fi
|
||||
rm /usr/local/cloud/systemvm -rf
|
||||
mkdir -p /usr/local/cloud/systemvm
|
||||
echo "All" | unzip $patchfile -d /usr/local/cloud/systemvm >$logfile 2>&1
|
||||
find /usr/local/cloud/systemvm/ -name \*.sh | xargs chmod 555
|
||||
if [ -f $backupfolder/cloud.jks ]; then
|
||||
cp -r $backupfolder/* /usr/local/cloud/systemvm/conf/
|
||||
echo "Restored keystore file and certs using backup" >> $logfile
|
||||
fi
|
||||
rm -fr $backupfolder
|
||||
# Import global cacerts into 'cloud' service's keystore
|
||||
keytool -importkeystore -srckeystore /etc/ssl/certs/java/cacerts -destkeystore /usr/local/cloud/systemvm/certs/realhostip.keystore -srcstorepass changeit -deststorepass vmops.com -noprompt || true
|
||||
return 0
|
||||
}
|
||||
|
||||
patch() {
|
||||
local PATCH_MOUNT=/media/cdrom
|
||||
local logfile="/var/log/patchsystemvm.log"
|
||||
if [ "$TYPE" == "consoleproxy" ] || [ "$TYPE" == "secstorage" ] && [ -f ${PATCH_MOUNT}/agent.zip ] && [ -f /var/cache/cloud/patch.required ]
|
||||
then
|
||||
echo "Patching systemvm for cloud service with mount=$PATCH_MOUNT for type=$TYPE" >> $logfile
|
||||
patch_systemvm ${PATCH_MOUNT}/agent.zip
|
||||
if [ $? -gt 0 ]
|
||||
then
|
||||
echo "Failed to apply patch systemvm\n" >> $logfile
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
rm -f /var/cache/cloud/patch.required
|
||||
chmod -x /etc/systemd/system/cloud*.service
|
||||
systemctl daemon-reload
|
||||
umount $PATCH_MOUNT || true
|
||||
|
||||
if [ -f /mnt/cmdline ]; then
|
||||
cat /mnt/cmdline > $CMDLINE
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
bootstrap() {
|
||||
log_it "Bootstrapping systemvm appliance"
|
||||
|
||||
export HYPERVISOR=$(hypervisor)
|
||||
[ $? -ne 0 ] && log_it "Failed to detect hypervisor type, bailing out of early init" && exit 10
|
||||
log_it "Detected that we are running inside $HYPERVISOR"
|
||||
|
||||
config_guest
|
||||
get_boot_params
|
||||
get_systemvm_type
|
||||
patch
|
||||
sync
|
||||
sysctl -p
|
||||
|
||||
log_it "Configuring systemvm type=$TYPE"
|
||||
if [ -f "/opt/cloud/bin/setup/$TYPE.sh" ]; then
|
||||
/opt/cloud/bin/setup/$TYPE.sh
|
||||
else
|
||||
/opt/cloud/bin/setup/default.sh
|
||||
fi
|
||||
log_it "Finished setting up systemvm"
|
||||
exit 0
|
||||
}
|
||||
|
||||
bootstrap
|
||||
@ -16,10 +16,7 @@
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
#set -x
|
||||
#exec 3>&0 4>&1 > /var/log/test.log 2>&1
|
||||
PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
|
||||
CMDLINE=/var/cache/cloud/cmdline
|
||||
|
||||
# Clear boot up flag, it would be created by rc.local after boot up done
|
||||
mkdir -p /var/cache/cloud
|
||||
@ -34,114 +31,6 @@ log_it() {
|
||||
log_action_msg "$@"
|
||||
}
|
||||
|
||||
hypervisor() {
|
||||
if [ -d /proc/xen ]; then
|
||||
mount -t xenfs none /proc/xen
|
||||
$(dmesg | grep -q "Xen HVM")
|
||||
if [ $? -eq 0 ]; then # 1=PV,0=HVM
|
||||
echo "xen-hvm" && return 0
|
||||
else
|
||||
echo "xen-pv" && return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
[ -x /usr/sbin/virt-what ] && local facts=( $(virt-what) )
|
||||
if [ "$facts" != "" ]; then
|
||||
# Xen HVM is recognized as Hyperv when Viridian extensions are enabled
|
||||
if [ "${facts[-1]}" == "xen-domU" ] && [ "${facts[0]}" == "hyperv" ]; then
|
||||
echo "xen-hvm" && return 0
|
||||
else
|
||||
echo ${facts[-1]} && return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
grep -q QEMU /proc/cpuinfo && echo "kvm" && return 0
|
||||
grep -q QEMU /var/log/messages && echo "kvm" && return 0
|
||||
|
||||
vmware-checkvm &> /dev/null && echo "vmware" && return 0
|
||||
|
||||
echo "unknown" && return 1
|
||||
}
|
||||
|
||||
config_guest() {
|
||||
if [ "$HYPERVISOR" == "kvm" ]
|
||||
then
|
||||
# Configure hot-plug
|
||||
modprobe acpiphp || true
|
||||
modprobe pci_hotplug || true
|
||||
sed -i -e "/^s0:2345:respawn.*/d" /etc/inittab
|
||||
sed -i -e "/6:23:respawn/a\s0:2345:respawn:/sbin/getty -L 115200 ttyS0 vt102" /etc/inittab
|
||||
fi
|
||||
[ ! -d /proc/xen ] && sed -i 's/^vc/#vc/' /etc/inittab && telinit q
|
||||
[ -d /proc/xen ] && sed -i 's/^#vc/vc/' /etc/inittab && telinit q
|
||||
}
|
||||
|
||||
get_boot_params() {
|
||||
case $HYPERVISOR in
|
||||
xen-pv|xen-domU)
|
||||
cat /proc/cmdline > $CMDLINE
|
||||
sed -i "s/%/ /g" $CMDLINE
|
||||
;;
|
||||
xen-hvm)
|
||||
if [ ! -f /usr/bin/xenstore-read ]; then
|
||||
log_it "ERROR: xentools not installed, cannot found xenstore-read" && exit 5
|
||||
fi
|
||||
/usr/bin/xenstore-read vm-data/cloudstack/init > $CMDLINE
|
||||
sed -i "s/%/ /g" $CMDLINE
|
||||
;;
|
||||
kvm)
|
||||
# Use any old cmdline as backup only
|
||||
if [ -s $CMDLINE ]; then
|
||||
mv $CMDLINE $CMDLINE.old
|
||||
log_it "Found a non-empty old cmdline file"
|
||||
fi
|
||||
systemctl enable --now qemu-guest-agent
|
||||
# Wait for $CMDLINE file to be written by the qemu-guest-agent
|
||||
for i in {1..60}; do
|
||||
if [ -s $CMDLINE ]; then
|
||||
log_it "Received a new non-empty cmdline file from qemu-guest-agent"
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
# Use any old cmdline only when new cmdline is not received
|
||||
if [ -e $CMDLINE.old ]; then
|
||||
if [ -s $CMDLINE ]; then
|
||||
rm $CMDLINE.old
|
||||
else
|
||||
mv $CMDLINE.old $CMDLINE
|
||||
log_it "Using old cmdline file, VM was perhaps rebooted."
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
vmware)
|
||||
vmtoolsd --cmd 'machine.id.get' > $CMDLINE
|
||||
;;
|
||||
virtualpc|hyperv)
|
||||
# Hyper-V is recognized as virtualpc hypervisor type. Boot args are passed using KVP Daemon
|
||||
#waiting for the hv_kvp_daemon to start up
|
||||
#sleep need to fix the race condition of hv_kvp_daemon and cloud-early-config
|
||||
[ -f /usr/sbin/hv_kvp_daemon ] && /usr/sbin/hv_kvp_daemon
|
||||
sleep 5
|
||||
cp -f /var/opt/hyperv/.kvp_pool_0 $CMDLINE
|
||||
cat /dev/null > /var/opt/hyperv/.kvp_pool_0
|
||||
;;
|
||||
virtualbox)
|
||||
# Virtualbox is used to test the virtual router
|
||||
# get the commandline from a dmistring (yes, hacky!)
|
||||
dmidecode | grep cmdline | sed 's/^.*cmdline://' > $CMDLINE
|
||||
RV=$?
|
||||
if [ $RV -ne 0 ] ; then
|
||||
log_it "Failed to get cmdline from a virtualbox dmi property"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
get_systemvm_type() {
|
||||
export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)
|
||||
}
|
||||
|
||||
patch() {
|
||||
local PATCH_MOUNT=/media/cdrom
|
||||
local patchfile=$PATCH_MOUNT/cloud-scripts.tgz
|
||||
@ -162,7 +51,9 @@ patch() {
|
||||
cdrom_dev=/dev/cdrom3
|
||||
fi
|
||||
|
||||
[ -f /var/cache/cloud/authorized_keys ] && privkey=/var/cache/cloud/authorized_keys
|
||||
if [ -f /var/cache/cloud/authorized_keys ]; then
|
||||
privkey=/var/cache/cloud/authorized_keys
|
||||
fi
|
||||
|
||||
if [ -n "$cdrom_dev" ]; then
|
||||
mount -o ro $cdrom_dev $PATCH_MOUNT
|
||||
@ -177,17 +68,13 @@ patch() {
|
||||
tar xzf $patchfile -C /
|
||||
echo ${newmd5} > ${md5file}
|
||||
log_it "Patched scripts using $patchfile"
|
||||
|
||||
log_it "Patching cloud service"
|
||||
/opt/cloud/bin/setup/patchsystemvm.sh $PATCH_MOUNT $TYPE
|
||||
touch /var/cache/cloud/patch.required
|
||||
fi
|
||||
|
||||
[ -f $privkey ] && cp -f $privkey /root/.ssh/ && chmod go-rwx /root/.ssh/authorized_keys
|
||||
umount $PATCH_MOUNT
|
||||
fi
|
||||
|
||||
if [ -f /mnt/cmdline ]; then
|
||||
cat /mnt/cmdline > $CMDLINE
|
||||
if [ -f $privkey ]; then
|
||||
cp -f $privkey /root/.ssh/
|
||||
chmod go-rwx /root/.ssh/authorized_keys
|
||||
fi
|
||||
fi
|
||||
|
||||
return 0
|
||||
@ -202,27 +89,11 @@ start() {
|
||||
rm -f /root/.rnd
|
||||
echo "" > /root/.ssh/known_hosts
|
||||
|
||||
export HYPERVISOR=$(hypervisor)
|
||||
[ $? -ne 0 ] && log_it "Failed to detect hypervisor type, bailing out of early init" && exit 10
|
||||
log_it "Detected that we are running inside $HYPERVISOR"
|
||||
|
||||
config_guest
|
||||
get_boot_params
|
||||
get_systemvm_type
|
||||
patch
|
||||
sync
|
||||
sysctl -p
|
||||
|
||||
log_it "Configuring systemvm type=$TYPE"
|
||||
|
||||
if [ -f "/opt/cloud/bin/setup/$TYPE.sh" ]; then
|
||||
/opt/cloud/bin/setup/$TYPE.sh
|
||||
else
|
||||
/opt/cloud/bin/setup/default.sh
|
||||
fi
|
||||
/opt/cloud/bin/setup/bootstrap.sh
|
||||
|
||||
log_it "Finished setting up systemvm"
|
||||
|
||||
exit 0
|
||||
}
|
||||
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
#!/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.
|
||||
|
||||
#set -x
|
||||
logfile="/var/log/patchsystemvm.log"
|
||||
|
||||
# To use existing console proxy .zip-based package file
|
||||
patch_systemvm() {
|
||||
local patchfile=$1
|
||||
local backupfolder="/tmp/.conf.backup"
|
||||
if [ -f /usr/local/cloud/systemvm/conf/cloud.jks ]; then
|
||||
rm -fr $backupfolder
|
||||
mkdir -p $backupfolder
|
||||
cp -r /usr/local/cloud/systemvm/conf/* $backupfolder/
|
||||
fi
|
||||
rm /usr/local/cloud/systemvm -rf
|
||||
mkdir -p /usr/local/cloud/systemvm
|
||||
echo "All" | unzip $patchfile -d /usr/local/cloud/systemvm >$logfile 2>&1
|
||||
find /usr/local/cloud/systemvm/ -name \*.sh | xargs chmod 555
|
||||
if [ -f $backupfolder/cloud.jks ]; then
|
||||
cp -r $backupfolder/* /usr/local/cloud/systemvm/conf/
|
||||
echo "Restored keystore file and certs using backup" >> $logfile
|
||||
fi
|
||||
rm -fr $backupfolder
|
||||
# Import global cacerts into 'cloud' service's keystore
|
||||
keytool -importkeystore -srckeystore /etc/ssl/certs/java/cacerts -destkeystore /usr/local/cloud/systemvm/certs/realhostip.keystore -srcstorepass changeit -deststorepass vmops.com -noprompt || true
|
||||
return 0
|
||||
}
|
||||
|
||||
CMDLINE=/var/cache/cloud/cmdline
|
||||
PATCH_MOUNT=$1
|
||||
TYPE=$2
|
||||
|
||||
# Refresh and setup systemd
|
||||
chmod -x /etc/systemd/system/cloud*.service
|
||||
systemctl daemon-reload
|
||||
|
||||
echo "Patching systemvm for cloud service with mount=$PATCH_MOUNT for type=$TYPE" >> $logfile
|
||||
|
||||
if [ "$TYPE" == "consoleproxy" ] || [ "$TYPE" == "secstorage" ] && [ -f ${PATCH_MOUNT}/agent.zip ]
|
||||
then
|
||||
patch_systemvm ${PATCH_MOUNT}/agent.zip
|
||||
if [ $? -gt 0 ]
|
||||
then
|
||||
echo "Failed to apply patch systemvm\n" >> $logfile
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
@ -96,7 +96,9 @@ setup_router() {
|
||||
sed -i "s/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4
|
||||
|
||||
# Setup hourly logrotate
|
||||
mv -n /etc/cron.daily/logrotate /etc/cron.hourly 2>&1
|
||||
if [ -f /etc/cron.daily/logrotate ]; then
|
||||
mv -n /etc/cron.daily/logrotate /etc/cron.hourly 2>&1
|
||||
fi
|
||||
}
|
||||
|
||||
routing_svcs
|
||||
|
||||
@ -108,8 +108,10 @@ EOF
|
||||
echo 0 > /var/cache/cloud/dnsmasq_managed_lease
|
||||
fi
|
||||
|
||||
#setup hourly logrotate
|
||||
mv -n /etc/cron.daily/logrotate /etc/cron.hourly 2>&1
|
||||
# Setup hourly logrotate
|
||||
if [ -f /etc/cron.daily/logrotate ]; then
|
||||
mv -n /etc/cron.daily/logrotate /etc/cron.hourly 2>&1
|
||||
fi
|
||||
}
|
||||
|
||||
routing_svcs
|
||||
|
||||
@ -67,6 +67,7 @@ function install_packages() {
|
||||
libtcnative-1 libssl-dev libapr1-dev \
|
||||
python-flask \
|
||||
haproxy \
|
||||
haveged \
|
||||
radvd \
|
||||
sharutils genisoimage aria2 \
|
||||
strongswan libcharon-extra-plugins libstrongswan-extra-plugins \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user