From 900226184f309c5ea1260a69336c391f49446c11 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Mon, 13 Apr 2015 16:56:35 +0200 Subject: [PATCH] Revert "Refactored install_puppet.sh into common playbook" This reverts commit 178a5476ae8b319cde1c24c684daf820a278c129. --- ...et_modules.yml => install_puppet_and_modules.yml} | 4 ++++ roles/common/tasks/main.yml | 12 ------------ 2 files changed, 4 insertions(+), 12 deletions(-) rename roles/bootstrap_puppetmaster/tasks/{install_puppet_modules.yml => install_puppet_and_modules.yml} (54%) diff --git a/roles/bootstrap_puppetmaster/tasks/install_puppet_modules.yml b/roles/bootstrap_puppetmaster/tasks/install_puppet_and_modules.yml similarity index 54% rename from roles/bootstrap_puppetmaster/tasks/install_puppet_modules.yml rename to roles/bootstrap_puppetmaster/tasks/install_puppet_and_modules.yml index 229dddc..33d4982 100644 --- a/roles/bootstrap_puppetmaster/tasks/install_puppet_modules.yml +++ b/roles/bootstrap_puppetmaster/tasks/install_puppet_and_modules.yml @@ -1,4 +1,8 @@ --- +# 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 39e7228..8b18828 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -4,15 +4,3 @@ # 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