Skip to content

Commit

Permalink
Set the pypiserver root to the correct directory
Browse files Browse the repository at this point in the history
The folder from which pypiserver will serve the wheels that are
pre-built in the repo-build process was incorrectly set, resulting
in pypiserver never, ever serving the wheels but instead always
forwarding on to the nginx reverse proxy to fetch things from
pypi.

Now that the root folder is correctly set, two things will happen:

* Wheels will be served from pypi, negating the need to use the
  pip_links, so [1] should pass once this merges.
* Once the repo build is complete, the packages available to
  install will be restricted properly to only the packages
  built by the repo build process.

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

Change-Id: I16706d399f6b026a6d0004fd07e5f18605a7b5db
(cherry picked from commit 3e247f6)
  • Loading branch information
Jesse Pretorius committed Apr 19, 2018
1 parent 65f6630 commit 22f31de
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ repo_pypiserver_pip_packages:

# Set the path to place all built python wheels
# This is used by pypiserver to serve them
repo_pypiserver_package_path: "{{ repo_service_home_folder }}/pools"
repo_pypiserver_package_path: "{{ repo_service_home_folder }}/repo/pools"

# Path to the pypiserver python virtualenv binaries
repo_pypiserver_bin: "/openstack/venvs/pypiserver-1.2.0/bin"
Expand Down

0 comments on commit 22f31de

Please sign in to comment.