Remove zuulv2.5 hacks

Now that zuulv3 is well into development, we can stop installing
things related to zuulv2.5.

Change-Id: Icd630871ad2991cdf884f6569237827100934138
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-03-15 15:44:29 -04:00
parent dc3ac2381a
commit e7af59e895
2 changed files with 0 additions and 14 deletions

View File

@ -26,16 +26,3 @@
when: zuul_install_method == 'git' or zuul_install_method == 'pip'
- include: "install/{{ zuul_install_method }}.yaml"
# TODO(pabelanger): Remove once https://review.openstack.org/#/c/316387/ has
# been merged.
- name: Install missing pip dependencies
become: yes
pip:
name: "{{ item.name }}"
version: "{{ item.version|default(omit) }}"
virtualenv: "{{ zuul_pip_virtualenv|default(omit) }}"
with_items:
- { name: 'jenkins-job-builder', version: '1.6.1' }
- { name: 'pyzmq' }
when: zuul_install_method == 'git' or zuul_install_method == 'pip'

View File

@ -23,7 +23,6 @@ pidfile = /var/run/zuul-scheduler/zuul-scheduler.pid
state_dir = /var/lib/zuul
[executor]
jenkins_jobs=/var/lib/zuul
log_config = /etc/zuul/executor-logging.conf
workspace_root=/var/lib/zuul/workspace