summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Macken <lmacken@redhat.com>2014-10-31 18:25:43 +0000
committerLuke Macken <lmacken@redhat.com>2014-10-31 18:25:43 +0000
commit5be3a3cbb9ffba9d661ca54d1afbf6e67589cf92 (patch)
tree9cc4771b773d7ea98696ddc09d14215edf2e1bf7
parentee00fb884ed34e6d12b4c4de448438eacbd3858a (diff)
downloadansible-5be3a3cbb9ffba9d661ca54d1afbf6e67589cf92.tar.gz
ansible-5be3a3cbb9ffba9d661ca54d1afbf6e67589cf92.tar.xz
ansible-5be3a3cbb9ffba9d661ca54d1afbf6e67589cf92.zip
Turn the hardcoded mirrormanger user/group ids into variables
-rw-r--r--roles/mirrorlist/tasks/main.yml4
-rw-r--r--roles/mirrorlist/vars/main.yml4
-rw-r--r--roles/mirrormanager/package/tasks/main.yml16
-rw-r--r--roles/mirrormanager/package/vars/main.yml4
4 files changed, 18 insertions, 10 deletions
diff --git a/roles/mirrorlist/tasks/main.yml b/roles/mirrorlist/tasks/main.yml
index b687bc98e..23208e317 100644
--- a/roles/mirrorlist/tasks/main.yml
+++ b/roles/mirrorlist/tasks/main.yml
@@ -1,8 +1,8 @@
---
# tasklist for setting up the mirrorlist app components
# create mirrormanager user
-- name: add mirrormanager user - uid 441
- user: name=mirrormanager uid=441 state=present home=/home/mirrormanager createhome=yes
+- name: add mirrormanager user - uid {{ mirrormanager_uid }}
+ user: name=mirrormanager uid={{ mirrormanager_uid }} state=present home=/home/mirrormanager createhome=yes
- name: install supervisor and mirrormanager
yum: pkg={{ item }} state=installed
diff --git a/roles/mirrorlist/vars/main.yml b/roles/mirrorlist/vars/main.yml
new file mode 100644
index 000000000..089784c9b
--- /dev/null
+++ b/roles/mirrorlist/vars/main.yml
@@ -0,0 +1,4 @@
+mirrormanager_uid: 441
+mirrormanager_gid: 441
+mirrors_gid: 263
+mirrors2_gid: 529
diff --git a/roles/mirrormanager/package/tasks/main.yml b/roles/mirrormanager/package/tasks/main.yml
index 7e775cd6a..2db535af1 100644
--- a/roles/mirrormanager/package/tasks/main.yml
+++ b/roles/mirrormanager/package/tasks/main.yml
@@ -6,19 +6,19 @@
state=true
persistent=true
-- name: add mirrormanager group - gid 441
- group: name=mirrormanager gid=441
+- name: add mirrormanager group - gid {{ mirrormanager_gid }}
+ group: name=mirrormanager gid={{ mirrormanager_gid }}
-- name: add mirrors group - gid 263
- group: name=mirrors gid=263
+- name: add mirrors group - gid {{ mirrors_gid }}
+ group: name=mirrors gid={{ mirrors_gid }}
-- name: add mirrors2 group - gid 529
- group: name=mirrors2 gid=529
+- name: add mirrors2 group - gid {{ mirrors2_gid }}
+ group: name=mirrors2 gid={{ mirrors2_gid }}
-- name: add mirrormanager user - uid 441
+- name: add mirrormanager user - uid {{ mirrormanager_uid }}
user: >
name=mirrormanager
- uid=441
+ uid={{ mirrormanager_uid }}
group=mirrormanager
groups=mirrors,mirrors2,apache
state=present
diff --git a/roles/mirrormanager/package/vars/main.yml b/roles/mirrormanager/package/vars/main.yml
new file mode 100644
index 000000000..089784c9b
--- /dev/null
+++ b/roles/mirrormanager/package/vars/main.yml
@@ -0,0 +1,4 @@
+mirrormanager_uid: 441
+mirrormanager_gid: 441
+mirrors_gid: 263
+mirrors2_gid: 529