summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Saulnier <fantom@fedoraproject.org>2014-05-22 10:07:17 +0200
committerMatthieu Saulnier <fantom@fedoraproject.org>2014-05-22 10:07:17 +0200
commitc25b2229d3e03255a69f42175e9fe7979a9d78b4 (patch)
tree24b80d7947faeb3d7942d09cb8407002658a8849
parent89516d69266027ad8fba6bb076b0f58c88c217d9 (diff)
downloadplaybooks-ansible-c25b2229d3e03255a69f42175e9fe7979a9d78b4.tar.gz
playbooks-ansible-c25b2229d3e03255a69f42175e9fe7979a9d78b4.tar.xz
playbooks-ansible-c25b2229d3e03255a69f42175e9fe7979a9d78b4.zip
Create catrust role needed to run before common role
-rw-r--r--main.yml1
-rw-r--r--roles/catrust/handlers/main.yml2
-rw-r--r--roles/catrust/tasks/main.yml (renamed from roles/common/tasks/ca.yml)5
-rw-r--r--roles/common/tasks/main.yml3
4 files changed, 5 insertions, 6 deletions
diff --git a/main.yml b/main.yml
index f610768..9e234eb 100644
--- a/main.yml
+++ b/main.yml
@@ -2,6 +2,7 @@
- hosts: all
remote_user: root
roles:
+ - catrust
- common
- hosts: clients
diff --git a/roles/catrust/handlers/main.yml b/roles/catrust/handlers/main.yml
new file mode 100644
index 0000000..07d9b04
--- /dev/null
+++ b/roles/catrust/handlers/main.yml
@@ -0,0 +1,2 @@
+- name: ca update
+ command: /usr/bin/update-ca-trust
diff --git a/roles/common/tasks/ca.yml b/roles/catrust/tasks/main.yml
index 2bf0e0d..983b1da 100644
--- a/roles/common/tasks/ca.yml
+++ b/roles/catrust/tasks/main.yml
@@ -1,8 +1,7 @@
- name: Installation de mon autorité de certification
copy: src=root.pem dest=/etc/pki/ca-trust/source/anchors/root.pem mode=444
+ notify: ca update
- name: Installation de l'autorité de certification CACert
copy: src=cacert.pem dest=/etc/pki/ca-trust/source/anchors/cacert.pem mode=444
-
-- name: Mise à jour de la base de confiance CA
- command: /usr/bin/update-ca-trust
+ notify: ca update
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index afaa4cb..6d3e2ef 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -13,9 +13,6 @@
- name: Configurations variables fichier setvars
include: setvars.yml
-- name: Gestion des Autorités de Certification
- include: ca.yml
-
- name: Configuration Yum
include: yum.yml