Allow pip_install to run in repo-server playbook
In order to switch from having a repo server which has all the python packages on it to a caching server which *optionally* has packages on it, we make use of a combination of pypiserver and nginx in a reverse proxy configuration. This patch implements the changes to ensure that we are able to do pip installs in the repo_server role and to transport the pypiserver logs via rsyslog to the central log server. The pip_offline_install var is also set in group_vars as it's used in group_vars, but is only set in the pip_install role. Change-Id: Id20a43fed833d53ca0f147f517deafba6587352d Implements: blueprint python-build-install-simplification Signed-off-by: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
This commit is contained in:
parent
94ba499d65
commit
4b63ebf490
@ -22,5 +22,10 @@ pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
||||
# The upper constraints to apply to all pip installations
|
||||
pip_install_upper_constraints: "{{ repo_release_path }}/requirements_absolute_requirements.txt"
|
||||
|
||||
# Allow the deployer to force pip to download locally to the deployment host
|
||||
# and copy it to the remote container for installation. Useful for environments
|
||||
# where the containers lack internet access.
|
||||
pip_offline_install: false
|
||||
|
||||
# The URL to retrieve the get-pip.py installation script
|
||||
pip_upstream_url: "{{ (pip_offline_install | bool) | ternary('https://bootstrap.pypa.io/get-pip.py', repo_release_path ~ '/get-pip.py') }}"
|
||||
|
@ -20,6 +20,9 @@
|
||||
user: root
|
||||
pre_tasks:
|
||||
|
||||
- include: common-tasks/set-upper-constraints.yml
|
||||
- include: common-tasks/set-pip-upstream-url.yml
|
||||
|
||||
- name: Check if the git cache exists on deployment host
|
||||
local_action:
|
||||
module: stat
|
||||
@ -53,6 +56,7 @@
|
||||
- hostvars['localhost']['resolvconf_enabled'] | bool
|
||||
roles:
|
||||
- role: "repo_server"
|
||||
|
||||
- role: "rsyslog_client"
|
||||
rsyslog_client_log_rotate_file: repo_nginx_log_rotate
|
||||
rsyslog_client_log_dir: "/var/log/nginx"
|
||||
@ -61,12 +65,21 @@
|
||||
rsyslog_client_config_name: "99-repo-nginx-rsyslog-client.conf"
|
||||
tags:
|
||||
- rsyslog
|
||||
|
||||
- role: "rsyslog_client"
|
||||
rsyslog_client_log_rotate_file: lsyncd_log_rotate
|
||||
rsyslog_client_log_dir: "/var/log/lsyncd"
|
||||
rsyslog_client_config_name: "99-lsyncd-rsyslog-client.conf"
|
||||
tags:
|
||||
- rsyslog
|
||||
|
||||
- role: "rsyslog_client"
|
||||
rsyslog_client_log_rotate_file: pypiserver_log_rotate
|
||||
rsyslog_client_log_dir: "/var/log/pypiserver"
|
||||
rsyslog_client_config_name: "99-pypiserver-rsyslog-client.conf"
|
||||
tags:
|
||||
- rsyslog
|
||||
|
||||
vars_files:
|
||||
- defaults/repo_packages/openstack_services.yml
|
||||
vars:
|
||||
|
Loading…
x
Reference in New Issue
Block a user