← Back to branch summary

~rlane/nova/ldapimprovements

« back to all changes in this revision

Viewing changes to contrib/puppet/manifests/templates.pp

  • Committer: Ryan Lane
  • Date: 2010-11-24 15:46:32 UTC
  • mfrom: (382.48.1 trunk)
  • Revision ID: laner@controller-20101124154632-zh7kwjuyyd02a2lh
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/puppet/manifests/templates.pp
 
1
# templates.pp
 
2
 
 
3
import "classes/*"
 
4
 
 
5
class baseclass {
 
6
#  include dns-client  # FIXME: missing resolv.conf.erb??
 
7
  include issue
 
8
}
 
9
 
 
10
node default {
 
11
  $nova_site = "undef"
 
12
  $nova_ns1 = "undef"
 
13
  $nova_ns2 = "undef"
 
14
#  include baseclass
 
15
}
 
16
 
 
17
# novanode handles the system-level requirements for Nova/Swift nodes
 
18
class novanode {
 
19
  include baseclass
 
20
  include lvmconf
 
21
}