From 7bd8117e2a78240ee447a0417e2924515bf52d10 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 28 Aug 2018 16:47:06 +1000
Subject: [PATCH] Add install-puppet to base playbook

This role manages puppet on the host and should be applied to all
puppet hosts.

The dependent change is required to get the "puppet" group into the
generated inventory for the system-config-run-base test.

Change-Id: I0e18c53836baca743d32abf1bb4b7a3f63c025bb
Depends-On: https://review.openstack.org/596994
---
 .zuul.yaml          | 8 ++++++++
 playbooks/base.yaml | 1 +
 2 files changed, 9 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index f0bf1934bc..47ad8dd226 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -131,6 +131,14 @@
           label: ubuntu-bionic
         - name: centos7
           label: centos-7
+      groups:
+        # We test puppet installation on this group.  Note bionic not
+        # in here as we have no bionic puppeted nodes (yet?)
+        - name: puppet
+          nodes:
+            - trusty
+            - xenial
+            - centos7
     host-vars:
       trusty:
         ansible_python_interpreter: python2
diff --git a/playbooks/base.yaml b/playbooks/base.yaml
index 1719e2de53..474d2e3673 100644
--- a/playbooks/base.yaml
+++ b/playbooks/base.yaml
@@ -13,6 +13,7 @@
 
 - hosts: "puppet:!disabled"
   roles:
+    - puppet-install
     - disable-puppet-agent
 
 - hosts: "!ci-backup:!disabled"