Skip to content

Commit

Permalink
unify package installation
Browse files Browse the repository at this point in the history
* install all mandatory packages
* do not install sudo separately (though this can be kept just to be
  sure)
* install all utility packages
* remove the functionality from 'bootstrap.yml'

Fixes ticket:3036
  • Loading branch information
Mikhail Sobolev committed Nov 23, 2014
1 parent 9f27542 commit 13d4c09
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
6 changes: 0 additions & 6 deletions bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,4 @@
- name: install ansible
raw: "env ASSUME_ALWAYS_YES=YES pkg install ansible"

- name: install mandatory packages
pkgng:
name: "{{item}}"
state: present
with_items: mandatory_packages

# vim:ft=yaml:nosi:noai:ts=2:sw=2
1 change: 1 addition & 0 deletions roles/base/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
- include: secrets.yml
- include: packages.yml
- include: sudo.yml
- include: users.yml
11 changes: 11 additions & 0 deletions roles/base/tasks/packages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- name: install mandatory packages
pkgng:
name: "{{item}}"
state: present
with_items: mandatory_packages

- name: install utility packages
pkgng:
name: "{{item}}"
state: present
with_items: utility_packages
3 changes: 0 additions & 3 deletions roles/base/tasks/sudo.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
---
- name: install sudo
pkgng: name=sudo state=present

- name: enable sudo modular configuration
lineinfile:
dest: "/usr/local/etc/sudoers"
Expand Down

0 comments on commit 13d4c09

Please sign in to comment.