From 178a5476ae8b319cde1c24c684daf820a278c129 Mon Sep 17 00:00:00 2001
From: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com>
Date: Mon, 13 Apr 2015 15:50:39 +0200
Subject: [PATCH] Refactored install_puppet.sh into common playbook
---
...et_and_modules.yml => install_puppet_modules.yml} | 4 ----
roles/common/tasks/main.yml | 12 ++++++++++++
2 files changed, 12 insertions(+), 4 deletions(-)
rename roles/bootstrap_puppetmaster/tasks/{install_puppet_and_modules.yml => install_puppet_modules.yml} (54%)
diff --git a/roles/bootstrap_puppetmaster/tasks/install_puppet_and_modules.yml b/roles/bootstrap_puppetmaster/tasks/install_puppet_modules.yml
similarity index 54%
rename from roles/bootstrap_puppetmaster/tasks/install_puppet_and_modules.yml
rename to roles/bootstrap_puppetmaster/tasks/install_puppet_modules.yml
index 33d4982..229dddc 100644
--- a/roles/bootstrap_puppetmaster/tasks/install_puppet_and_modules.yml
+++ b/roles/bootstrap_puppetmaster/tasks/install_puppet_modules.yml
@@ -1,8 +1,4 @@
---
-# Install puppet
-- command: bash /opt/system-config/production/install_puppet.sh
- tags: install_puppet
-
# Install puppet modules
- command: bash /opt/system-config/production/install_modules.sh
tags: install_puppet_modules
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 8b18828..39e7228 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -4,3 +4,15 @@
# Install git
- apt: name=git
+
+# Clone system-config
+- git: repo="{{ system_config_repo_https_url }}"
+ dest=/opt/system-config/production
+ accept_hostkey=True
+ version="{{ system_config_branch }}"
+ force=True
+ tags: clone_system_config
+
+# Install puppet
+- command: bash /opt/system-config/production/install_puppet.sh
+ tags: install_puppet