From 3ed99c0b27122ff00e2d236086ab16b0cc1887c1 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Tue, 20 Jun 2017 14:09:30 -0400 Subject: [PATCH] mv lib/oslo to lib/libraries There is confusion about where installation of new libraries should end up, to prevent lots of little files being added make a lib/libraries which is the old lib/oslo. Put compat functions and includes in place to help with transition. Change-Id: Ieeab605d187ef6aec571211ab235ea67fa95a607 --- lib/libraries | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++ lib/oslo | 121 +------------------------------------------- stack.sh | 6 +-- 3 files changed, 140 insertions(+), 122 deletions(-) create mode 100644 lib/libraries diff --git a/lib/libraries b/lib/libraries new file mode 100644 index 0000000000..9feb503f1b --- /dev/null +++ b/lib/libraries @@ -0,0 +1,135 @@ +#!/bin/bash +# +# lib/oslo +# +# Functions to install **Oslo** libraries from git +# +# We need this to handle the fact that projects would like to use +# pre-released versions of oslo libraries. + +# Dependencies: +# +# - ``functions`` file + +# ``stack.sh`` calls the entry points in this order: +# +# - install_oslo + +# Save trace setting +_XTRACE_LIB_OSLO=$(set +o | grep xtrace) +set +o xtrace + + +# Defaults +# -------- +GITDIR["automaton"]=$DEST/automaton +GITDIR["castellan"]=$DEST/castellan +GITDIR["cliff"]=$DEST/cliff +GITDIR["cursive"]=$DEST/cursive +GITDIR["debtcollector"]=$DEST/debtcollector +GITDIR["futurist"]=$DEST/futurist +GITDIR["os-client-config"]=$DEST/os-client-config +GITDIR["osc-lib"]=$DEST/osc-lib +GITDIR["oslo.cache"]=$DEST/oslo.cache +GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency +GITDIR["oslo.config"]=$DEST/oslo.config +GITDIR["oslo.context"]=$DEST/oslo.context +GITDIR["oslo.db"]=$DEST/oslo.db +GITDIR["oslo.i18n"]=$DEST/oslo.i18n +GITDIR["oslo.log"]=$DEST/oslo.log +GITDIR["oslo.messaging"]=$DEST/oslo.messaging +GITDIR["oslo.middleware"]=$DEST/oslo.middleware +GITDIR["oslo.policy"]=$DEST/oslo.policy +GITDIR["oslo.privsep"]=$DEST/oslo.privsep +GITDIR["oslo.reports"]=$DEST/oslo.reports +GITDIR["oslo.rootwrap"]=$DEST/oslo.rootwrap +GITDIR["oslo.serialization"]=$DEST/oslo.serialization +GITDIR["oslo.service"]=$DEST/oslo.service +GITDIR["oslo.utils"]=$DEST/oslo.utils +GITDIR["oslo.versionedobjects"]=$DEST/oslo.versionedobjects +GITDIR["oslo.vmware"]=$DEST/oslo.vmware +GITDIR["osprofiler"]=$DEST/osprofiler +GITDIR["pycadf"]=$DEST/pycadf +GITDIR["python-openstacksdk"]=$DEST/python-openstacksdk +GITDIR["stevedore"]=$DEST/stevedore +GITDIR["taskflow"]=$DEST/taskflow +GITDIR["tooz"]=$DEST/tooz +# TODO(mriedem): This is a common pattern so even though os-traits isn't +# officially an oslo library, it is nice to re-use this script for non-oslo +# things like os-traits. We should rename this script to be more generic +# and then fold os-brick into it also. +GITDIR["os-traits"]=$DEST/os-traits + +# Support entry points installation of console scripts +OSLO_BIN_DIR=$(get_python_exec_prefix) + + +# Functions +# --------- + +function _install_lib_from_source { + local name=$1 + if use_library_from_git "$name"; then + git_clone_by_name "$name" + setup_dev_lib "$name" + fi +} + +# install_oslo - install libraries that oslo needs +function install_oslo { + install_libs +} + +# install_libs() - Install additional libraries that we need and want +# on all environments. Some will only install here if from source, +# others will always install. +function install_libs { + _install_lib_from_source "automaton" + _install_lib_from_source "castellan" + _install_lib_from_source "cliff" + _install_lib_from_source "cursive" + _install_lib_from_source "debtcollector" + _install_lib_from_source "futurist" + _install_lib_from_source "osc-lib" + _install_lib_from_source "os-client-config" + _install_lib_from_source "oslo.cache" + _install_lib_from_source "oslo.concurrency" + _install_lib_from_source "oslo.config" + _install_lib_from_source "oslo.context" + _install_lib_from_source "oslo.db" + _install_lib_from_source "oslo.i18n" + _install_lib_from_source "oslo.log" + _install_lib_from_source "oslo.messaging" + _install_lib_from_source "oslo.middleware" + _install_lib_from_source "oslo.policy" + _install_lib_from_source "oslo.privsep" + _install_lib_from_source "oslo.reports" + _install_lib_from_source "oslo.rootwrap" + _install_lib_from_source "oslo.serialization" + _install_lib_from_source "oslo.service" + _install_lib_from_source "oslo.utils" + _install_lib_from_source "oslo.versionedobjects" + _install_lib_from_source "oslo.vmware" + _install_lib_from_source "osprofiler" + _install_lib_from_source "pycadf" + _install_lib_from_source "python-openstacksdk" + _install_lib_from_source "stevedore" + _install_lib_from_source "taskflow" + _install_lib_from_source "tooz" + # installation of additional libraries + # + # os-traits for nova + _install_lib_from_source "os-traits" + + # etcd (because tooz does not have a hard dependency on these) + pip_install etcd3 + pip_install etcd3gw +} + +# Restore xtrace +$_XTRACE_LIB_OSLO + +# Tell emacs to use shell-script-mode +## Local variables: +## mode: shell-script +## End: diff --git a/lib/oslo b/lib/oslo index cbfd5fb513..3ae64c8210 100644 --- a/lib/oslo +++ b/lib/oslo @@ -6,123 +6,6 @@ # # We need this to handle the fact that projects would like to use # pre-released versions of oslo libraries. - -# Dependencies: # -# - ``functions`` file - -# ``stack.sh`` calls the entry points in this order: -# -# - install_oslo - -# Save trace setting -_XTRACE_LIB_OSLO=$(set +o | grep xtrace) -set +o xtrace - - -# Defaults -# -------- -GITDIR["automaton"]=$DEST/automaton -GITDIR["castellan"]=$DEST/castellan -GITDIR["cliff"]=$DEST/cliff -GITDIR["cursive"]=$DEST/cursive -GITDIR["debtcollector"]=$DEST/debtcollector -GITDIR["futurist"]=$DEST/futurist -GITDIR["os-client-config"]=$DEST/os-client-config -GITDIR["osc-lib"]=$DEST/osc-lib -GITDIR["oslo.cache"]=$DEST/oslo.cache -GITDIR["oslo.concurrency"]=$DEST/oslo.concurrency -GITDIR["oslo.config"]=$DEST/oslo.config -GITDIR["oslo.context"]=$DEST/oslo.context -GITDIR["oslo.db"]=$DEST/oslo.db -GITDIR["oslo.i18n"]=$DEST/oslo.i18n -GITDIR["oslo.log"]=$DEST/oslo.log -GITDIR["oslo.messaging"]=$DEST/oslo.messaging -GITDIR["oslo.middleware"]=$DEST/oslo.middleware -GITDIR["oslo.policy"]=$DEST/oslo.policy -GITDIR["oslo.privsep"]=$DEST/oslo.privsep -GITDIR["oslo.reports"]=$DEST/oslo.reports -GITDIR["oslo.rootwrap"]=$DEST/oslo.rootwrap -GITDIR["oslo.serialization"]=$DEST/oslo.serialization -GITDIR["oslo.service"]=$DEST/oslo.service -GITDIR["oslo.utils"]=$DEST/oslo.utils -GITDIR["oslo.versionedobjects"]=$DEST/oslo.versionedobjects -GITDIR["oslo.vmware"]=$DEST/oslo.vmware -GITDIR["osprofiler"]=$DEST/osprofiler -GITDIR["pycadf"]=$DEST/pycadf -GITDIR["python-openstacksdk"]=$DEST/python-openstacksdk -GITDIR["stevedore"]=$DEST/stevedore -GITDIR["taskflow"]=$DEST/taskflow -GITDIR["tooz"]=$DEST/tooz -# TODO(mriedem): This is a common pattern so even though os-traits isn't -# officially an oslo library, it is nice to re-use this script for non-oslo -# things like os-traits. We should rename this script to be more generic -# and then fold os-brick into it also. -GITDIR["os-traits"]=$DEST/os-traits - -# Support entry points installation of console scripts -OSLO_BIN_DIR=$(get_python_exec_prefix) - - -# Functions -# --------- - -function _do_install_oslo_lib { - local name=$1 - if use_library_from_git "$name"; then - git_clone_by_name "$name" - setup_dev_lib "$name" - fi -} - -# install_oslo() - Collect source and prepare -function install_oslo { - _do_install_oslo_lib "automaton" - _do_install_oslo_lib "castellan" - _do_install_oslo_lib "cliff" - _do_install_oslo_lib "cursive" - _do_install_oslo_lib "debtcollector" - _do_install_oslo_lib "futurist" - _do_install_oslo_lib "osc-lib" - _do_install_oslo_lib "os-client-config" - _do_install_oslo_lib "oslo.cache" - _do_install_oslo_lib "oslo.concurrency" - _do_install_oslo_lib "oslo.config" - _do_install_oslo_lib "oslo.context" - _do_install_oslo_lib "oslo.db" - _do_install_oslo_lib "oslo.i18n" - _do_install_oslo_lib "oslo.log" - _do_install_oslo_lib "oslo.messaging" - _do_install_oslo_lib "oslo.middleware" - _do_install_oslo_lib "oslo.policy" - _do_install_oslo_lib "oslo.privsep" - _do_install_oslo_lib "oslo.reports" - _do_install_oslo_lib "oslo.rootwrap" - _do_install_oslo_lib "oslo.serialization" - _do_install_oslo_lib "oslo.service" - _do_install_oslo_lib "oslo.utils" - _do_install_oslo_lib "oslo.versionedobjects" - _do_install_oslo_lib "oslo.vmware" - _do_install_oslo_lib "osprofiler" - _do_install_oslo_lib "pycadf" - _do_install_oslo_lib "python-openstacksdk" - _do_install_oslo_lib "stevedore" - _do_install_oslo_lib "taskflow" - _do_install_oslo_lib "tooz" - # installation of additional libraries - # - # os-traits for nova - _do_install_oslo_lib "os-traits" - - # etcd (because tooz does not have a hard dependency on these) - pip_install etcd3 - pip_install etcd3gw -} - -# Restore xtrace -$_XTRACE_LIB_OSLO - -# Tell emacs to use shell-script-mode -## Local variables: -## mode: shell-script -## End: +# Included for compatibility with grenade, remove in Queens +source $TOP_DIR/lib/libraries diff --git a/stack.sh b/stack.sh index c46859567c..7034bc4ca2 100755 --- a/stack.sh +++ b/stack.sh @@ -592,7 +592,7 @@ source $TOP_DIR/lib/tls # Source project function libraries source $TOP_DIR/lib/infra -source $TOP_DIR/lib/oslo +source $TOP_DIR/lib/libraries source $TOP_DIR/lib/lvm source $TOP_DIR/lib/horizon source $TOP_DIR/lib/keystone @@ -822,8 +822,8 @@ fi echo_summary "Installing OpenStack project source" -# Install Oslo libraries -install_oslo +# Install additional libraries +install_libs # Install uwsgi install_apache_uwsgi