diff options
| author | Rajesh Joseph <rjoseph@redhat.com> | 2016-05-16 14:38:24 +0530 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-05-18 10:10:14 -0700 |
| commit | 57185759ccf4c43cf3143d917f782419625c743e (patch) | |
| tree | b9eb26b6a951742eb2a9969c66890407edf94220 /extras/devel-tools/devel-vagrant/ansible | |
| parent | 58615482ed87ff4b8253081c6ea26471fcf09070 (diff) | |
extra/devel-vagrant: accept gluster src location from user
Currently gluster source location is hard-coded in vagrantfile.
Made the source location user configurable and also fixed minor issue
with peer probe with single node.
Change-Id: I7057a97d7372477ddbf01fbc8db949923dfd86e8
BUG: 1336354
Signed-off-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-on: http://review.gluster.org/14354
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'extras/devel-tools/devel-vagrant/ansible')
3 files changed, 14 insertions, 9 deletions
diff --git a/extras/devel-tools/devel-vagrant/ansible/roles/cluster/tasks/main.yml b/extras/devel-tools/devel-vagrant/ansible/roles/cluster/tasks/main.yml index 1f1ab6116d6..3306c7a3dc2 100644 --- a/extras/devel-tools/devel-vagrant/ansible/roles/cluster/tasks/main.yml +++ b/extras/devel-tools/devel-vagrant/ansible/roles/cluster/tasks/main.yml @@ -1,6 +1,5 @@ --- -- name: Gluster peer probe +- name: gluster peer probe shell: gluster peer probe {{ item }} - with_items: groups ['group1'] - + with_items: "{{ peer_nodes | default([]) }}" diff --git a/extras/devel-tools/devel-vagrant/ansible/roles/compile-gluster/tasks/main.yml b/extras/devel-tools/devel-vagrant/ansible/roles/compile-gluster/tasks/main.yml index 1807dc05f33..6ee258c7780 100644 --- a/extras/devel-tools/devel-vagrant/ansible/roles/compile-gluster/tasks/main.yml +++ b/extras/devel-tools/devel-vagrant/ansible/roles/compile-gluster/tasks/main.yml @@ -1,9 +1,10 @@ --- - name: autogen.sh - shell: chdir=/work/source/glusterfs ./autogen.sh + shell: chdir={{ item }} ./autogen.sh + with_items: "{{ trg_path }}" - name: configure - shell: chdir=/work/source/glusterfs CFLAGS="-g -O0 -Werror -Wall -Wno-error=cpp -Wno-error=maybe-uninitialized" \ + shell: chdir={{ item }} CFLAGS="-g -O0 -Werror -Wall -Wno-error=cpp -Wno-error=maybe-uninitialized" \ ./configure \ --prefix=/usr \ --exec-prefix=/usr \ @@ -20,7 +21,9 @@ --infodir=/usr/share/info \ --libdir=/usr/lib64 \ --enable-debug + with_items: "{{ trg_path }}" - name: make install - shell: chdir=/work/source/glusterfs make install + shell: chdir={{ item }} make install + with_items: "{{ trg_path }}" diff --git a/extras/devel-tools/devel-vagrant/ansible/setup.yml b/extras/devel-tools/devel-vagrant/ansible/setup.yml index 764078f3669..c26bd7d6051 100644 --- a/extras/devel-tools/devel-vagrant/ansible/setup.yml +++ b/extras/devel-tools/devel-vagrant/ansible/setup.yml @@ -1,6 +1,7 @@ --- - hosts: all - sudo: true + become: yes + become_method: sudo roles: - install-pkgs - prepare-brick @@ -8,13 +9,15 @@ - iptables - hosts: all - sudo: true + become: yes + become_method: sudo serial: 1 roles: - compile-gluster - service - hosts: origin - sudo: true + become: yes + become_method: sudo roles: - cluster |