From abc67376b7f4e291fbc5d6df04973265c88cd3ff Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Sat, 18 Apr 2015 23:16:29 +0200 Subject: [PATCH] Remove provision_infra_servers and add pre/post playbooks Running provision AND configuration on same run causes race-conditions from dynamic inventory, like meta groups not being available later in the play. Better run provision_infra_servers on its own and have site.yml just for the configuration play. --- site.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site.yml b/site.yml index 2b81725..40aee34 100644 --- a/site.yml +++ b/site.yml @@ -1,6 +1,5 @@ --- # file: site.yml -- include: provision_infra_servers.yml - include: common.yml - include: set_hostnames.yml - include: deploy_site_pp.yml @@ -8,4 +7,7 @@ - include: bootstrap_puppetmaster.yml - include: bootstrap_puppet_infra_nodes.yml - include: sign_infra_nodes_certs.yml +- include: pre_puppet_gerrit.yml - include: run_puppet_infra_nodes.yml +- include: post_puppet_gerrit.yml +- include: post_puppet_jenkins.yml