diff --git a/group_vars/all/pip.yml b/group_vars/all/pip.yml
index f98ab70f3f..8a862a274c 100644
--- a/group_vars/all/pip.yml
+++ b/group_vars/all/pip.yml
@@ -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') }}"
diff --git a/playbooks/repo-server.yml b/playbooks/repo-server.yml
index 25b0a09de2..d1ec5ba92a 100644
--- a/playbooks/repo-server.yml
+++ b/playbooks/repo-server.yml
@@ -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: