Merge "Allow pip_install to run in repo-server playbook"
This commit is contained in:
commit
157f5f4659
@ -22,5 +22,10 @@ pip_lock_to_internal_repo: "{{ (pip_links | length) >= 1 }}"
|
|||||||
# The upper constraints to apply to all pip installations
|
# The upper constraints to apply to all pip installations
|
||||||
pip_install_upper_constraints: "{{ repo_release_path }}/requirements_absolute_requirements.txt"
|
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
|
# 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') }}"
|
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
|
user: root
|
||||||
pre_tasks:
|
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
|
- name: Check if the git cache exists on deployment host
|
||||||
local_action:
|
local_action:
|
||||||
module: stat
|
module: stat
|
||||||
@ -53,6 +56,7 @@
|
|||||||
- hostvars['localhost']['resolvconf_enabled'] | bool
|
- hostvars['localhost']['resolvconf_enabled'] | bool
|
||||||
roles:
|
roles:
|
||||||
- role: "repo_server"
|
- role: "repo_server"
|
||||||
|
|
||||||
- role: "rsyslog_client"
|
- role: "rsyslog_client"
|
||||||
rsyslog_client_log_rotate_file: repo_nginx_log_rotate
|
rsyslog_client_log_rotate_file: repo_nginx_log_rotate
|
||||||
rsyslog_client_log_dir: "/var/log/nginx"
|
rsyslog_client_log_dir: "/var/log/nginx"
|
||||||
@ -61,12 +65,21 @@
|
|||||||
rsyslog_client_config_name: "99-repo-nginx-rsyslog-client.conf"
|
rsyslog_client_config_name: "99-repo-nginx-rsyslog-client.conf"
|
||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- rsyslog
|
||||||
|
|
||||||
- role: "rsyslog_client"
|
- role: "rsyslog_client"
|
||||||
rsyslog_client_log_rotate_file: lsyncd_log_rotate
|
rsyslog_client_log_rotate_file: lsyncd_log_rotate
|
||||||
rsyslog_client_log_dir: "/var/log/lsyncd"
|
rsyslog_client_log_dir: "/var/log/lsyncd"
|
||||||
rsyslog_client_config_name: "99-lsyncd-rsyslog-client.conf"
|
rsyslog_client_config_name: "99-lsyncd-rsyslog-client.conf"
|
||||||
tags:
|
tags:
|
||||||
- rsyslog
|
- 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:
|
vars_files:
|
||||||
- defaults/repo_packages/openstack_services.yml
|
- defaults/repo_packages/openstack_services.yml
|
||||||
vars:
|
vars:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user