diff --git a/stack.sh b/stack.sh index 57049d9c4f..c78c07405c 100755 --- a/stack.sh +++ b/stack.sh @@ -317,7 +317,6 @@ source $TOP_DIR/lib/tempest # Set the destination directories for OpenStack projects HORIZON_DIR=$DEST/horizon -OPENSTACKCLIENT_DIR=$DEST/python-openstackclient NOVNC_DIR=$DEST/noVNC SWIFT_DIR=$DEST/swift SWIFT3_DIR=$DEST/swift3 @@ -813,9 +812,6 @@ install_keystoneclient install_glanceclient install_novaclient -# Check out the client libs that are used most -git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH - # glance, swift middleware and nova api needs keystone middleware if is_service_enabled key g-api n-api swift; then # unified auth system (manages accounts/tokens) @@ -881,7 +877,6 @@ echo_summary "Configuring OpenStack projects" # allowing ``import nova`` or ``import glance.client`` configure_keystoneclient configure_novaclient -setup_develop $OPENSTACKCLIENT_DIR if is_service_enabled key g-api n-api swift; then configure_keystone fi diff --git a/stackrc b/stackrc index 9588cf99a7..9a244edd44 100644 --- a/stackrc +++ b/stackrc @@ -76,10 +76,6 @@ HORIZON_BRANCH=master NOVACLIENT_REPO=${GIT_BASE}/openstack/python-novaclient.git NOVACLIENT_BRANCH=master -# consolidated openstack python client -OPENSTACKCLIENT_REPO=${GIT_BASE}/openstack/python-openstackclient.git -OPENSTACKCLIENT_BRANCH=master - # python keystone client library to nova that horizon uses KEYSTONECLIENT_REPO=${GIT_BASE}/openstack/python-keystoneclient KEYSTONECLIENT_BRANCH=master