mirror of
https://github.com/OpenNebula/one.git
synced 2025-01-11 05:17:41 +03:00
* Support for system ds disks of type BLOCK, required by newer versions
of libvirt/qemu
* Improved parsing of driver messages
* Explicit set of backing file type for newer versions of qemu-img
* Conform to new openssl command output
* Add lock file for ubuntu2204 ruby gems and new dependencies
co-authored-by: Christian González <cgonzalez@opennebula.io>
(cherry picked from commit f006341931)
This commit is contained in:
Ruben S. Montero
parent
78d9f21471
commit
68ce7dc0d0
247
share/install_gems/Ubuntu2204/Gemfile.lock
Normal file
247
share/install_gems/Ubuntu2204/Gemfile.lock
Normal file
@ -0,0 +1,247 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (4.2.11.3)
|
||||
i18n (~> 0.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
android_key_attestation (0.3.0)
|
||||
augeas (0.6.4)
|
||||
awrence (1.2.1)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.574.0)
|
||||
aws-sdk-cloudwatch (1.62.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-core (3.130.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-ec2 (1.305.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.55.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.113.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.4)
|
||||
aws-sigv4 (1.4.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
azure_mgmt_compute (0.22.0)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
azure_mgmt_monitor (0.19.0)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
azure_mgmt_network (0.26.1)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
azure_mgmt_resources (0.18.2)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
azure_mgmt_storage (0.23.0)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
bindata (2.4.10)
|
||||
builder (3.2.4)
|
||||
cbor (0.5.9.6)
|
||||
chunky_png (1.4.0)
|
||||
concurrent-ruby (1.1.10)
|
||||
configparser (0.1.7)
|
||||
curb (1.0.0)
|
||||
daemons (1.4.1)
|
||||
dalli (2.7.11)
|
||||
domain_name (0.5.20190701)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
eventmachine (1.2.7)
|
||||
faraday (1.10.0)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-cookie_jar (0.0.7)
|
||||
faraday (>= 0.8.0)
|
||||
http-cookie (~> 1.0.0)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.0.3)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-net_http (1.0.1)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
faraday_middleware (1.2.0)
|
||||
faraday (~> 1.0)
|
||||
ffi (1.15.5)
|
||||
ffi-rzmq (2.0.7)
|
||||
ffi-rzmq-core (>= 1.0.7)
|
||||
ffi-rzmq-core (1.0.7)
|
||||
ffi
|
||||
git (1.10.2)
|
||||
rchardet (~> 1.8)
|
||||
gnuplot (2.6.2)
|
||||
hashie (5.0.0)
|
||||
highline (1.7.10)
|
||||
http-cookie (1.0.4)
|
||||
domain_name (~> 0.5)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
inflection (1.0.0)
|
||||
ipaddr (1.2.4)
|
||||
ipaddress (0.8.3)
|
||||
jmespath (1.6.1)
|
||||
json (2.6.1)
|
||||
jwt (2.3.0)
|
||||
memcache-client (1.8.5)
|
||||
mini_mime (1.1.2)
|
||||
mini_portile2 (2.8.0)
|
||||
minitest (5.15.0)
|
||||
ms_rest (0.7.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
faraday (>= 0.9, < 2.0.0)
|
||||
timeliness (~> 0.3.10)
|
||||
ms_rest_azure (0.12.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
faraday (>= 0.9, < 2.0.0)
|
||||
faraday-cookie_jar (~> 0.0.6)
|
||||
ms_rest (~> 0.7.6)
|
||||
multipart-post (2.1.1)
|
||||
mustermann (1.1.1)
|
||||
ruby2_keywords (~> 0.0.1)
|
||||
mysql2 (0.5.3)
|
||||
net-ldap (0.17.0)
|
||||
nokogiri (1.13.3)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
openssl (3.0.0)
|
||||
ipaddr
|
||||
optimist (3.0.1)
|
||||
ox (2.14.11)
|
||||
parse-cron (0.1.4)
|
||||
pg (1.3.5)
|
||||
polyglot (0.3.5)
|
||||
public_suffix (4.0.6)
|
||||
racc (1.6.0)
|
||||
rack (2.2.3)
|
||||
rack-protection (2.2.0)
|
||||
rack
|
||||
rbvmomi (3.0.0)
|
||||
builder (~> 3.2)
|
||||
json (~> 2.3)
|
||||
nokogiri (~> 1.10)
|
||||
optimist (~> 3.0)
|
||||
rchardet (1.8.0)
|
||||
rexml (3.2.5)
|
||||
rotp (6.2.0)
|
||||
rqrcode (2.1.1)
|
||||
chunky_png (~> 1.0)
|
||||
rqrcode_core (~> 1.0)
|
||||
rqrcode_core (1.2.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
safety_net_attestation (0.4.0)
|
||||
jwt (~> 2.0)
|
||||
sequel (5.55.0)
|
||||
sinatra (2.2.0)
|
||||
mustermann (~> 1.0)
|
||||
rack (~> 2.2)
|
||||
rack-protection (= 2.2.0)
|
||||
tilt (~> 2.0)
|
||||
sqlite3 (1.4.2)
|
||||
thin (1.8.1)
|
||||
daemons (~> 1.0, >= 1.0.9)
|
||||
eventmachine (~> 1.0, >= 1.0.4)
|
||||
rack (>= 1, < 3)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.0.10)
|
||||
timeliness (0.3.10)
|
||||
treetop (1.6.11)
|
||||
polyglot (~> 0.3)
|
||||
tzinfo (1.2.9)
|
||||
thread_safe (~> 0.1)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.8.1)
|
||||
uuidtools (2.2.0)
|
||||
vsphere-automation-cis (0.4.7)
|
||||
vsphere-automation-runtime (~> 0.4.6)
|
||||
vsphere-automation-runtime (0.4.7)
|
||||
vsphere-automation-vcenter (0.4.7)
|
||||
vsphere-automation-cis (~> 0.4.6)
|
||||
vsphere-automation-runtime (~> 0.4.6)
|
||||
webrick (1.7.0)
|
||||
xmlrpc (0.3.2)
|
||||
webrick
|
||||
zendesk_api (1.35.0)
|
||||
faraday (>= 0.9.0, < 2.0.0)
|
||||
hashie (>= 3.5.2, < 6.0.0)
|
||||
inflection
|
||||
mini_mime
|
||||
multipart-post (~> 2.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
activesupport (~> 4.2)
|
||||
addressable
|
||||
augeas (~> 0.6)
|
||||
aws-sdk-cloudwatch
|
||||
aws-sdk-ec2 (>= 1.151)
|
||||
aws-sdk-s3
|
||||
azure_mgmt_compute
|
||||
azure_mgmt_monitor
|
||||
azure_mgmt_network
|
||||
azure_mgmt_resources
|
||||
azure_mgmt_storage
|
||||
configparser
|
||||
curb
|
||||
dalli (< 3.0)
|
||||
faraday_middleware (~> 1.2.0)
|
||||
ffi-rzmq (~> 2.0.7)
|
||||
git (~> 1.5)
|
||||
gnuplot
|
||||
highline (~> 1.7)
|
||||
i18n (~> 0.9)
|
||||
ipaddress (~> 0.8.3)
|
||||
json (>= 2.0)
|
||||
memcache-client
|
||||
minitest
|
||||
mysql2
|
||||
net-ldap
|
||||
nokogiri
|
||||
ox
|
||||
parse-cron
|
||||
pg
|
||||
public_suffix
|
||||
rack
|
||||
rbvmomi (~> 3.0.0)
|
||||
rotp
|
||||
rqrcode
|
||||
sequel
|
||||
sinatra
|
||||
sqlite3
|
||||
thin
|
||||
treetop (>= 1.6.3)
|
||||
uuidtools
|
||||
vsphere-automation-cis (~> 0.4.6)
|
||||
vsphere-automation-vcenter (~> 0.4.6)
|
||||
webauthn
|
||||
xmlrpc
|
||||
zendesk_api
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.7.0p0
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.3
|
||||
@ -566,11 +566,11 @@ int Datastore::set_ds_disk_type(string& s_dt, string& error)
|
||||
//Valid disk types for System DS
|
||||
case Image::FILE:
|
||||
case Image::RBD:
|
||||
case Image::BLOCK:
|
||||
break;
|
||||
|
||||
case Image::GLUSTER:
|
||||
case Image::SHEEPDOG:
|
||||
case Image::BLOCK:
|
||||
case Image::ISCSI:
|
||||
case Image::CD_ROM:
|
||||
case Image::RBD_CDROM:
|
||||
|
||||
@ -186,7 +186,7 @@ function create_signature {
|
||||
serviceKey=$(hmac_sha256 hexkey:"${regionKey}" "s3")
|
||||
signingKey=$(hmac_sha256 hexkey:"${serviceKey}" "aws4_request")
|
||||
|
||||
printf "${stringToSign}" | openssl dgst -sha256 -mac HMAC -macopt hexkey:"${signingKey}" | sed 's/(stdin)= //'
|
||||
printf "${stringToSign}" | openssl dgst -sha256 -mac HMAC -macopt hexkey:"${signingKey}" | sed 's/.*(stdin)= //'
|
||||
}
|
||||
|
||||
function s3_curl_args
|
||||
|
||||
@ -67,6 +67,7 @@ void ImageManager::_cp(unique_ptr<image_msg_t> msg)
|
||||
|
||||
ostringstream oss;
|
||||
istringstream is(info);
|
||||
is >> skipws;
|
||||
|
||||
auto image = ipool->get(msg->oid());
|
||||
|
||||
@ -74,7 +75,7 @@ void ImageManager::_cp(unique_ptr<image_msg_t> msg)
|
||||
{
|
||||
if (msg->status() == "SUCCESS")
|
||||
{
|
||||
is >> source >> ws;
|
||||
is >> source;
|
||||
|
||||
if (!source.empty())
|
||||
{
|
||||
@ -95,14 +96,14 @@ void ImageManager::_cp(unique_ptr<image_msg_t> msg)
|
||||
goto error;
|
||||
}
|
||||
|
||||
is >> source >> ws;
|
||||
is >> source;
|
||||
|
||||
if (is.fail())
|
||||
{
|
||||
goto error;
|
||||
}
|
||||
|
||||
is >> format >> ws;
|
||||
is >> format;
|
||||
|
||||
if (is.fail() || format.empty())
|
||||
{
|
||||
|
||||
@ -205,7 +205,7 @@ function create_base() {
|
||||
cd $DST_PATH.snap
|
||||
ln -f -s . $DST_FILE.snap ||:
|
||||
$COPY $SRC_PATH base
|
||||
qemu-img create -b $DST_FILE.snap/base -f qcow2 base.1
|
||||
qemu-img create -b $DST_FILE.snap/base -F qcow2 -f qcow2 base.1
|
||||
ln -f -s $DST_FILE.snap/base.1 $DST_PATH
|
||||
cd -
|
||||
}
|
||||
|
||||
@ -574,20 +574,21 @@ static int parse_auth_msg(
|
||||
// <driver> <username> <passwd> [gid...]
|
||||
//--------------------------------------------------------------------------
|
||||
is.str(ar.message);
|
||||
is >> skipws;
|
||||
|
||||
if ( is.good() )
|
||||
{
|
||||
is >> driver_name >> ws;
|
||||
is >> driver_name;
|
||||
}
|
||||
|
||||
if ( !is.fail() )
|
||||
{
|
||||
is >> mad_name >> ws;
|
||||
is >> mad_name;
|
||||
}
|
||||
|
||||
if ( !is.fail() )
|
||||
{
|
||||
is >> mad_pass >> ws;
|
||||
is >> mad_pass;
|
||||
}
|
||||
|
||||
while ( is.good() )
|
||||
@ -603,7 +604,7 @@ static int parse_auth_msg(
|
||||
gr_admin = true;
|
||||
}
|
||||
|
||||
is >> tmp_gid >> ws;
|
||||
is >> tmp_gid;
|
||||
|
||||
if ( is.fail() )
|
||||
{
|
||||
|
||||
@ -1083,6 +1083,12 @@ int LibVirtDriver::deployment_description_kvm(
|
||||
}
|
||||
}
|
||||
|
||||
if (vm->get_disk(disk_id)->is_volatile()) {
|
||||
// For volatile disk the type attribute is used to define if it is SWAP or FS,
|
||||
// For non-volatile disk it is set as subtype of disk_type (check Image::disk_attribute method)
|
||||
type = disk_type;
|
||||
}
|
||||
|
||||
// ---- Disk type and source for the image ----
|
||||
|
||||
if ( type == "BLOCK" || type == "BLOCK_CDROM" )
|
||||
|
||||
@ -978,12 +978,13 @@ int AddressRange::ip_to_i(const string& _ip, unsigned int& i_ip) const
|
||||
}
|
||||
|
||||
iss.str(ip);
|
||||
iss >> skipws;
|
||||
|
||||
i_ip = 0;
|
||||
|
||||
for (int i=0;i<4;i++)
|
||||
{
|
||||
iss >> dec >> tmp >> ws;
|
||||
iss >> dec >> tmp;
|
||||
|
||||
if ( tmp > 255 || iss.fail() )
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user