Add python-tackerclient to test-requirements.txt

python-tackerclient is now available in global
requirements [1]. Moving to use pip dependency
to pull in tackerclient instead of directly
referring to the release tarball.

[1] https://review.openstack.org/334641

Change-Id: I2bc758a56f2371671db60eb626ae87194506c0a4
This commit is contained in:
Sridhar Ramaswamy 2016-06-30 22:18:01 +00:00
parent c3fd989eff
commit 39a0ccaa23
4 changed files with 4 additions and 18 deletions

View File

@ -11,7 +11,6 @@
# ``stack.sh`` calls the entry points in this order:
#
# - install_tacker
# - install_tackerclient
# - configure_tacker
# - create_tacker_accounts
# - init_tacker
@ -40,10 +39,6 @@ if is_ssl_enabled_service "tacker" || is_service_enabled tls-proxy; then
fi
# Set up default directories
GITREPO["python-tackerclient"]=${TACKERCLIENT_REPO:-${GIT_BASE}/openstack/python-tackerclient.git}
GITBRANCH["python-tackerclient"]=${TACKERCLIENT_BRANCH:-master}
GITDIR["python-tackerclient"]=$DEST/python-tackerclient
GITREPO["tacker-horizon"]=${TACKERHORIZON_REPO:-${GIT_BASE}/openstack/tacker-horizon.git}
GITBRANCH["tacker-horizon"]=${TACKERHORZION_BRANCH:-master}
GITDIR["tacker-horizon"]=$DEST/tacker-horizon
@ -151,14 +146,6 @@ function install_tacker {
setup_develop $TACKER_DIR
}
# install_tackerclient() - Collect source and prepare
function install_tackerclient {
if use_library_from_git "python-tackerclient"; then
git_clone_by_name "python-tackerclient"
setup_dev_lib "python-tackerclient"
fi
}
function start_tacker_api {
local cfg_file_options="--config-file $TACKER_CONF"
local service_port=$TACKER_PORT
@ -414,4 +401,4 @@ function modify_heat_flavor_policy_rule {
local policy_file=$HEAT_CONF_DIR/policy.json
# Allow non-admin projects with 'admin' roles to create flavors in Heat
sed -i 's/"resource_types:OS::Nova::Flavor": "rule:context_is_admin"/"resource_types:OS::Nova::Flavor": "role:admin"/' $policy_file
}
}

View File

@ -14,7 +14,6 @@ if is_service_enabled tacker; then
# Perform installation of service source
echo_summary "Installing Tacker"
install_tacker
install_tackerclient
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
# Configure after the other layer 1 and 2 services have been configured

View File

@ -25,8 +25,8 @@ enable_service h-api-cw
enable_service tacker
# python-tackerclient and tacker-horizon isn't installable from pip
LIBS_FROM_GIT=python-tackerclient,tacker-horizon
# tacker-horizon isn't installable from pip
LIBS_FROM_GIT=tacker-horizon
MGMT_PHYS_NET=${MGMT_PHYS_NET:-mgmtphysnet0}
BR_MGMT=${BR_MGMT:-br-mgmt0}

View File

@ -4,7 +4,6 @@
# Despite above warning added by global sync process, please use
# ascii betical order.
http://tarballs.openstack.org/python-tackerclient/python-tackerclient-master.tar.gz#egg=python-tackerclient
cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
coverage>=3.6 # Apache-2.0
discover # BSD
@ -13,6 +12,7 @@ fixtures>=3.0.0 # Apache-2.0/BSD
hacking<0.11,>=0.10.2
mock>=2.0 # BSD
python-subunit>=0.0.18 # Apache-2.0/BSD
python-tackerclient>=0.4.0 # Apache-2.0
ordereddict # MIT
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
oslotest>=1.10.0 # Apache-2.0