diff options
| -rw-r--r-- | everest-repo/everest-repo-1.0.0/bootstrap.pp | 4 | ||||
| -rw-r--r-- | everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp | 15 | ||||
| -rw-r--r-- | everest-repo/everest-repo-1.0.0/repo.yaml (renamed from everest-repo/everest-repo-1.0.0/everest_module/files/repo.yaml) | 3 | ||||
| -rw-r--r-- | everest-repo/everest-repo.spec | 2 |
4 files changed, 8 insertions, 16 deletions
diff --git a/everest-repo/everest-repo-1.0.0/bootstrap.pp b/everest-repo/everest-repo-1.0.0/bootstrap.pp index cc214a6..85caba3 100644 --- a/everest-repo/everest-repo-1.0.0/bootstrap.pp +++ b/everest-repo/everest-repo-1.0.0/bootstrap.pp @@ -1,5 +1,5 @@ # Apparently there's an undocumented feature of Puppet related to module -# loading. When the puppet module was changed from 'everest' to 'everestrep' +# loading. When the puppet module was changed from 'everest' to 'everestrepo' # the following line was needed. import "everestrepo" -include everest::repo +include everestrepo::appliance diff --git a/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp b/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp index 3bc18c0..8fc25b3 100644 --- a/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp +++ b/everest-repo/everest-repo-1.0.0/everest_module/manifests/init.pp @@ -1,4 +1,4 @@ -class everest { +class everestrepo { class base { $user = 'everest' @@ -91,7 +91,7 @@ class everest { ensure => installed, } - everest::xinetd::dropfile { "git-daemon": + everestrepo::xinetd::dropfile { "git-daemon": module => "everestrepo", require => Package["git-daemon"], } @@ -257,7 +257,7 @@ class everest { # This class needs to have some sort of auto backup support # since it will be more 'mission critical' - class repo inherits base { + class appliance inherits base { include puppet include gitrepo include cobbler @@ -270,21 +270,12 @@ class everest { ensure => running, hasrestart => true, hasstatus => true, - subscribe => File["/etc/everest/machine_types.rb"], require => Package["rubygem-everestd"], } file { "/etc/everest": ensure => directory, } - - file { "/etc/everest/machine_types.rb": - ensure => present, - owner => "root", - group => "root", - mode => 0644, - source => "puppet:///everestrepo/machine_types.rb", - } # This allows all users to run puppetca --clean file { "/etc/sudoers": diff --git a/everest-repo/everest-repo-1.0.0/everest_module/files/repo.yaml b/everest-repo/everest-repo-1.0.0/repo.yaml index 078462d..c8ad8e7 100644 --- a/everest-repo/everest-repo-1.0.0/everest_module/files/repo.yaml +++ b/everest-repo/everest-repo-1.0.0/repo.yaml @@ -4,4 +4,5 @@ parameters: gitserver: localhost everest_machine_type: repo classes: -- everest::repo +- everestrepo::appliance +- repo_extensions diff --git a/everest-repo/everest-repo.spec b/everest-repo/everest-repo.spec index a6fed40..a0fad6b 100644 --- a/everest-repo/everest-repo.spec +++ b/everest-repo/everest-repo.spec @@ -46,7 +46,7 @@ mkdir -p $RPM_BUILD_ROOT/pub/git/puppet cp -r everest_module $RPM_BUILD_ROOT/etc/puppet/modules/everestrepo -cp everest_module/files/repo.yaml $RPM_BUILD_ROOT/etc/everest +cp repo.yaml $RPM_BUILD_ROOT/etc/everest cp everest_module/files/machine_types.rb $RPM_BUILD_ROOT/etc/everest cp bootstrap.pp $RPM_BUILD_ROOT/etc/everest cp EverestRepo.ks $RPM_BUILD_ROOT/etc/cobbler |