Clean up become logic for ansible 2.2

Also clean up bindep dependencies.

Change-Id: I76e721c276a0bef3cb5adc06ecfbc0450cb21c56
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-11-09 11:28:55 -05:00
parent 6c5f46469e
commit 682043b2f7
6 changed files with 10 additions and 2 deletions

View File

@ -1,4 +1,8 @@
# This is a cross-platform list tracking distribution packages needed by tests;
# see http://docs.openstack.org/infra/bindep/ for additional information.
python-pip
libffi-dev [platform:dpkg]
libffi-devel [platform:rpm]
libselinux-python [platform:rpm]
libssl-dev [platform:dpkg]
openssl-devel [platform:rpm]

View File

@ -18,6 +18,7 @@
when: jenkins_job_builder_build_depends is not defined
- name: Ensure build dependencies are installed.
become: yes
package:
name: "{{ item }}"
state: installed

View File

@ -13,12 +13,14 @@
# under the License.
---
- name: Git clone jenkins job builder.
become: yes
git:
dest: "{{ jenkins_job_builder_git_dest }}"
repo: "{{ jenkins_job_builder_git_uri }}"
version: "{{ jenkins_job_builder_git_version }}"
- name: Pip install jenkins_job_builder from local git repo.
become: yes
pip:
extra_args: "{{ jenkins_job_builder_pip_extra_args|default(omit) }}"
name: "file://{{ jenkins_job_builder_git_dest }}"

View File

@ -13,6 +13,7 @@
# under the License.
---
- name: Install jenkins-job-builder from package.
become: yes
package:
name: "{{ jenkins_job_builder_package_name }}"
state: installed

View File

@ -13,6 +13,7 @@
# under the License.
---
- name: Install jenkins job builder using pip.
become: yes
pip:
extra_args: "{{ jenkins_job_builder_pip_extra_args|default(omit) }}"
name: "{{ jenkins_job_builder_pip_name }}"

View File

@ -16,6 +16,5 @@
include_vars: "{{ ansible_os_family }}.yaml"
- include: install.yaml
become: yes
- include: config.yaml