summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2016-11-09 11:28:55 -0500
committerPaul Belanger <pabelanger@redhat.com>2016-11-09 11:29:10 -0500
commit682043b2f7a61fc6c74fb031d39fc26f97ea14f0 (patch)
treecb9bbaf2397350a846100a8e371eb11bb0f6093a
parent6c5f46469eaf968f0b7cfc8d88b61f70a3297ab9 (diff)
Clean up become logic for ansible 2.2
Also clean up bindep dependencies. Change-Id: I76e721c276a0bef3cb5adc06ecfbc0450cb21c56 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: Paul Belanger <pabelanger@redhat.com> Workflow+1: Paul Belanger <pabelanger@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 09 Nov 2016 17:00:38 +0000 Reviewed-on: https://review.openstack.org/395703 Project: openstack/ansible-role-jenkins-job-builder Branch: refs/heads/master
-rw-r--r--bindep.txt6
-rw-r--r--tasks/install.yaml1
-rw-r--r--tasks/install/git.yaml2
-rw-r--r--tasks/install/package.yaml1
-rw-r--r--tasks/install/pip.yaml1
-rw-r--r--tasks/main.yaml1
6 files changed, 10 insertions, 2 deletions
diff --git a/bindep.txt b/bindep.txt
index cac9e3d..3e30527 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,4 +1,8 @@
1# This is a cross-platform list tracking distribution packages needed by tests; 1# This is a cross-platform list tracking distribution packages needed by tests;
2# see http://docs.openstack.org/infra/bindep/ for additional information. 2# see http://docs.openstack.org/infra/bindep/ for additional information.
3 3
4python-pip 4libffi-dev [platform:dpkg]
5libffi-devel [platform:rpm]
6libselinux-python [platform:rpm]
7libssl-dev [platform:dpkg]
8openssl-devel [platform:rpm]
diff --git a/tasks/install.yaml b/tasks/install.yaml
index c4f5de0..99ece34 100644
--- a/tasks/install.yaml
+++ b/tasks/install.yaml
@@ -18,6 +18,7 @@
18 when: jenkins_job_builder_build_depends is not defined 18 when: jenkins_job_builder_build_depends is not defined
19 19
20- name: Ensure build dependencies are installed. 20- name: Ensure build dependencies are installed.
21 become: yes
21 package: 22 package:
22 name: "{{ item }}" 23 name: "{{ item }}"
23 state: installed 24 state: installed
diff --git a/tasks/install/git.yaml b/tasks/install/git.yaml
index cdf44ff..1d6560a 100644
--- a/tasks/install/git.yaml
+++ b/tasks/install/git.yaml
@@ -13,12 +13,14 @@
13# under the License. 13# under the License.
14--- 14---
15- name: Git clone jenkins job builder. 15- name: Git clone jenkins job builder.
16 become: yes
16 git: 17 git:
17 dest: "{{ jenkins_job_builder_git_dest }}" 18 dest: "{{ jenkins_job_builder_git_dest }}"
18 repo: "{{ jenkins_job_builder_git_uri }}" 19 repo: "{{ jenkins_job_builder_git_uri }}"
19 version: "{{ jenkins_job_builder_git_version }}" 20 version: "{{ jenkins_job_builder_git_version }}"
20 21
21- name: Pip install jenkins_job_builder from local git repo. 22- name: Pip install jenkins_job_builder from local git repo.
23 become: yes
22 pip: 24 pip:
23 extra_args: "{{ jenkins_job_builder_pip_extra_args|default(omit) }}" 25 extra_args: "{{ jenkins_job_builder_pip_extra_args|default(omit) }}"
24 name: "file://{{ jenkins_job_builder_git_dest }}" 26 name: "file://{{ jenkins_job_builder_git_dest }}"
diff --git a/tasks/install/package.yaml b/tasks/install/package.yaml
index 5440a1e..e9f2a2b 100644
--- a/tasks/install/package.yaml
+++ b/tasks/install/package.yaml
@@ -13,6 +13,7 @@
13# under the License. 13# under the License.
14--- 14---
15- name: Install jenkins-job-builder from package. 15- name: Install jenkins-job-builder from package.
16 become: yes
16 package: 17 package:
17 name: "{{ jenkins_job_builder_package_name }}" 18 name: "{{ jenkins_job_builder_package_name }}"
18 state: installed 19 state: installed
diff --git a/tasks/install/pip.yaml b/tasks/install/pip.yaml
index 7e76237..d4510da 100644
--- a/tasks/install/pip.yaml
+++ b/tasks/install/pip.yaml
@@ -13,6 +13,7 @@
13# under the License. 13# under the License.
14--- 14---
15- name: Install jenkins job builder using pip. 15- name: Install jenkins job builder using pip.
16 become: yes
16 pip: 17 pip:
17 extra_args: "{{ jenkins_job_builder_pip_extra_args|default(omit) }}" 18 extra_args: "{{ jenkins_job_builder_pip_extra_args|default(omit) }}"
18 name: "{{ jenkins_job_builder_pip_name }}" 19 name: "{{ jenkins_job_builder_pip_name }}"
diff --git a/tasks/main.yaml b/tasks/main.yaml
index db7e415..70a00e3 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -16,6 +16,5 @@
16 include_vars: "{{ ansible_os_family }}.yaml" 16 include_vars: "{{ ansible_os_family }}.yaml"
17 17
18- include: install.yaml 18- include: install.yaml
19 become: yes
20 19
21- include: config.yaml 20- include: config.yaml