"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "devstack/lib/magnum" between
magnum-8.1.0.tar.gz and magnum-8.2.0.tar.gz

About: OpenStack Magnum makes container orchestration engines such as Docker and Kubernetes available as first class resources in OpenStack.
The "Stein" series (maintained release).

magnum  (magnum-8.1.0):magnum  (magnum-8.2.0)
skipping to change at line 19 skipping to change at line 19
# - ``DEST``, ``DATA_DIR``, ``STACK_USER`` must be defined # - ``DEST``, ``DATA_DIR``, ``STACK_USER`` must be defined
# - ``SERVICE_{TENANT_NAME|PASSWORD}`` must be defined # - ``SERVICE_{TENANT_NAME|PASSWORD}`` must be defined
# ``stack.sh`` calls the entry points in this order: # ``stack.sh`` calls the entry points in this order:
# #
# - install_magnum # - install_magnum
# - configure_magnum # - configure_magnum
# - create_magnum_conf # - create_magnum_conf
# - init_magnum # - init_magnum
# - magnum_register_image # - magnum_register_image
# - magnum_configure_flavor
# - start_magnum # - start_magnum
# - configure_iptables_magnum # - configure_iptables_magnum
# - configure_apache_magnum # - configure_apache_magnum
# - stop_magnum # - stop_magnum
# - cleanup_magnum # - cleanup_magnum
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
skipping to change at line 261 skipping to change at line 262
create_magnum_cache_dir $MAGNUM_AUTH_CACHE_DIR create_magnum_cache_dir $MAGNUM_AUTH_CACHE_DIR
create_magnum_cache_dir $MAGNUM_CERTIFICATE_CACHE_DIR create_magnum_cache_dir $MAGNUM_CERTIFICATE_CACHE_DIR
} }
# magnum_register_image - Register heat image for magnum with property os_distro # magnum_register_image - Register heat image for magnum with property os_distro
function magnum_register_image { function magnum_register_image {
local magnum_image_property="--property os_distro=" local magnum_image_property="--property os_distro="
local atomic="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -io 'atomic' || true;)" local atomic="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -io 'atomic' || true;)"
if [ ! -z "$atomic" ]; then if [ ! -z "$atomic" ]; then
magnum_image_property=$magnum_image_property"fedora-atomic" magnum_image_property=$magnum_image_property"fedora-atomic --property hw _rng_model=virtio"
fi fi
local ubuntu="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -io "ubuntu" || true;)" local ubuntu="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -io "ubuntu" || true;)"
if [ ! -z "$ubuntu" ]; then if [ ! -z "$ubuntu" ]; then
magnum_image_property=$magnum_image_property"ubuntu" magnum_image_property=$magnum_image_property"ubuntu"
fi fi
local coreos="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -io "coreos" || true;)" local coreos="$(echo $MAGNUM_GUEST_IMAGE_URL | grep -io "coreos" || true;)"
if [ ! -z "$coreos" ]; then if [ ! -z "$coreos" ]; then
magnum_image_property=$magnum_image_property"coreos" magnum_image_property=$magnum_image_property"coreos"
fi fi
# os_distro property for fedora ironic image # os_distro property for fedora ironic image
skipping to change at line 295 skipping to change at line 296
break break
fi fi
done done
if [ -z ${image_name} ]; then if [ -z ${image_name} ]; then
echo "Unknown image extension in $image_filename, supported extensions: tgz, img, qcow2, iso, vhd, vhdx, tar.gz, img.gz, img.bz2, vhd.gz, vhdx.gz"; fals e echo "Unknown image extension in $image_filename, supported extensions: tgz, img, qcow2, iso, vhd, vhdx, tar.gz, img.gz, img.bz2, vhd.gz, vhdx.gz"; fals e
fi fi
openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT --os-image-ap i-version 2 image set $image_name $magnum_image_property openstack --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT --os-image-ap i-version 2 image set $image_name $magnum_image_property
} }
#magnum_configure_flavor - set hw_rng property for flavor to address the potenti
al entropy issue
function magnum_configure_flavor {
local magnum_flavor_property="--property hw_rng:allowed=True --property hw_r
ng:rate_bytes=1024 --property hw_rng:rate_period=1"
local FLAVOR_LIST=$(openstack --os-url $NOVA_SERVICE_PROTOCOL://$NOVA_HOSTPO
RT --os-compute-api-version 2.1 flavor list -c Name -f value)
for flavor in ${FLAVOR_LIST}; do
openstack --os-url $NOVA_SERVICE_PROTOCOL://$NOVA_HOSTPORT --os-compute-
api-version 2.1 flavor set $flavor $magnum_flavor_property
done
}
# install_magnumclient() - Collect source and prepare # install_magnumclient() - Collect source and prepare
function install_magnumclient { function install_magnumclient {
if use_library_from_git "python-magnumclient"; then if use_library_from_git "python-magnumclient"; then
git_clone_by_name "python-magnumclient" git_clone_by_name "python-magnumclient"
setup_dev_lib "python-magnumclient" setup_dev_lib "python-magnumclient"
sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-magnumclient"]} /tools/,/etc/bash_completion.d/}magnum.bash_completion sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-magnumclient"]} /tools/,/etc/bash_completion.d/}magnum.bash_completion
fi fi
} }
# install_magnum() - Collect source and prepare # install_magnum() - Collect source and prepare
 End of changes. 3 change blocks. 
1 lines changed or deleted 16 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)