From 5df6c98934ed6ce180aa3fc59e7ee35fd5421218 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 1 Oct 2013 19:08:30 +0000
Subject: [PATCH] Make the salt master also a minion
* modules/openstack_project/manifests/puppetmaster.pp: We need to be
able to trigger git pull of one or more repos on the puppet master,
which is also the salt master. The most convenient way to do this is
to make the master also a minion, so it can trigger execution of
things on itself.
Change-Id: Ic5b1d9f69617db345161dc6181799e6575b4e037
---
modules/openstack_project/manifests/puppetmaster.pp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp
index 8203d9b7cf..b957e020ab 100644
--- a/modules/openstack_project/manifests/puppetmaster.pp
+++ b/modules/openstack_project/manifests/puppetmaster.pp
@@ -8,6 +8,9 @@ class openstack_project::puppetmaster (
sysadmins => $sysadmins,
}
+ class { 'salt':
+ salt_master => 'ci-puppetmaster.openstack.org',
+ }
class { 'salt::master': }
cron { 'updatepuppetmaster':