summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-01-31 19:09:19 +0100
committervarac <varacanero@zeromail.org>2013-01-31 19:09:19 +0100
commite6fe80f9460b8bc013068e1dda8be6230b8d60a4 (patch)
treedca69ab0a423146d4a13db9fda4afe691ccb5f42
parent2585f661c55c3615eb95f660c101af70e9fd04e9 (diff)
tag 'base' is a bad idea because it invokes apache::base as well
-rw-r--r--puppet/modules/site_ca_daemon/manifests/init.pp2
-rw-r--r--puppet/modules/site_config/manifests/default.pp2
-rw-r--r--puppet/modules/site_config/manifests/slow.pp2
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp2
-rw-r--r--puppet/modules/site_nagios/manifests/init.pp2
-rw-r--r--puppet/modules/site_openvpn/manifests/init.pp2
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp2
7 files changed, 7 insertions, 7 deletions
diff --git a/puppet/modules/site_ca_daemon/manifests/init.pp b/puppet/modules/site_ca_daemon/manifests/init.pp
index c00a22c8..86e186bb 100644
--- a/puppet/modules/site_ca_daemon/manifests/init.pp
+++ b/puppet/modules/site_ca_daemon/manifests/init.pp
@@ -1,5 +1,5 @@
class site_ca_daemon {
- tag 'service'
+ tag 'leap_service'
#$definition_files = hiera('definition_files')
#$provider = $definition_files['provider']
#$eip_service = $definition_files['eip_service']
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 699eb4dd..14b389e8 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -1,5 +1,5 @@
class site_config::default {
- tag 'base'
+ tag 'leap_base'
$domain_hash = hiera('domain')
diff --git a/puppet/modules/site_config/manifests/slow.pp b/puppet/modules/site_config/manifests/slow.pp
index a4a9f19f..18b22a9c 100644
--- a/puppet/modules/site_config/manifests/slow.pp
+++ b/puppet/modules/site_config/manifests/slow.pp
@@ -1,5 +1,5 @@
class site_config::slow {
-
+ tag 'leap_slow'
class { 'site_apt::dist_upgrade':
stage => initial,
}
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 632df799..1789dd55 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -1,5 +1,5 @@
class site_couchdb {
- tag 'service'
+ tag 'leap_service'
include couchdb
$x509 = hiera('x509')
diff --git a/puppet/modules/site_nagios/manifests/init.pp b/puppet/modules/site_nagios/manifests/init.pp
index 57da3011..cab32905 100644
--- a/puppet/modules/site_nagios/manifests/init.pp
+++ b/puppet/modules/site_nagios/manifests/init.pp
@@ -1,4 +1,4 @@
class site_nagios {
- tag 'service'
+ tag 'leap_service'
include site_nagios::server
}
diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp
index df4277cd..e3d2a9af 100644
--- a/puppet/modules/site_openvpn/manifests/init.pp
+++ b/puppet/modules/site_openvpn/manifests/init.pp
@@ -1,5 +1,5 @@
class site_openvpn {
- tag 'service'
+ tag 'leap_service'
# parse hiera config
$ip_address = hiera('ip_address')
$interface = getvar("interface_${ip_address}")
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index d1951dcd..592241c1 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -1,5 +1,5 @@
class site_webapp {
- tag 'service'
+ tag 'leap_service'
$definition_files = hiera('definition_files')
$provider = $definition_files['provider']
$eip_service = $definition_files['eip_service']