On Tue, Aug 9, 2011 at 10:45 PM, Adam Stokes <adam.stokes(a)gmail.com> wrote:
No not these puppet scripts -- they are for assisting admins in
setting up matahari quickly. The util.pp holds the configfile class to
pull in yum.conf and repo information.
Ok, it just didnt appear to be used.
But if you've tested this and it works, you're welcome to commit :-)
( adam stokes ) || ( adam.stokes(a)gmail.com )
On Mon, Aug 8, 2011 at 1:41 AM, Andrew Beekhof <andrew(a)beekhof.net> wrote:
> I don't think we want matahari-devel in the kickstart script.
> What is contrib/puppet/matahari/manifests/util.pp for? The puppet
> scripts aren't intended for use by our sysconfig agent right?
>
>
> On Sat, Jul 30, 2011 at 3:33 AM, Adam Stokes <astokes(a)fedoraproject.org>
wrote:
>> - Add simple kickstart scripts with package list to
>> be included in existing kickstarts using %include
>> - Fedora/yum specific puppet manifests for installing
>> matahari and verifying that the services are at least
>> enabled but not running.
>>
>> Signed-off-by: Adam Stokes <astokes(a)fedoraproject.org>
>> ---
>> contrib/kickstart/matahari-win.ks | 3 +++
>> contrib/kickstart/matahari.ks | 10 ++++++++++
>> contrib/puppet/matahari/manifests/init.pp | 1 +
>> contrib/puppet/matahari/manifests/matahari.pp | 9 +++++++++
>> contrib/puppet/matahari/manifests/util.pp | 14 ++++++++++++++
>> contrib/puppet/matahari/manifests/yum.pp | 12 ++++++++++++
>> 6 files changed, 49 insertions(+), 0 deletions(-)
>> create mode 100644 contrib/kickstart/matahari-win.ks
>> create mode 100644 contrib/kickstart/matahari.ks
>> create mode 100644 contrib/puppet/matahari/manifests/init.pp
>> create mode 100644 contrib/puppet/matahari/manifests/matahari.pp
>> create mode 100644 contrib/puppet/matahari/manifests/util.pp
>> create mode 100644 contrib/puppet/matahari/manifests/yum.pp
>>
>> diff --git a/contrib/kickstart/matahari-win.ks
b/contrib/kickstart/matahari-win.ks
>> new file mode 100644
>> index 0000000..10e6252
>> --- /dev/null
>> +++ b/contrib/kickstart/matahari-win.ks
>> @@ -0,0 +1,3 @@
>> +%packages
>> +mingw32-matahari
>> +%end
>> diff --git a/contrib/kickstart/matahari.ks b/contrib/kickstart/matahari.ks
>> new file mode 100644
>> index 0000000..311682b
>> --- /dev/null
>> +++ b/contrib/kickstart/matahari.ks
>> @@ -0,0 +1,10 @@
>> +%packages
>> +matahari
>> +matahari-agent-lib
>> +matahari-service
>> +matahari-broker
>> +matahari-host
>> +matahari-net
>> +matahari-lib
>> +matahari-devel
>> +%end
>> diff --git a/contrib/puppet/matahari/manifests/init.pp
b/contrib/puppet/matahari/manifests/init.pp
>> new file mode 100644
>> index 0000000..a787ceb
>> --- /dev/null
>> +++ b/contrib/puppet/matahari/manifests/init.pp
>> @@ -0,0 +1 @@
>> +import 'matahari.pp'
>> diff --git a/contrib/puppet/matahari/manifests/matahari.pp
b/contrib/puppet/matahari/manifests/matahari.pp
>> new file mode 100644
>> index 0000000..057b82b
>> --- /dev/null
>> +++ b/contrib/puppet/matahari/manifests/matahari.pp
>> @@ -0,0 +1,9 @@
>> +class matahari {
>> + package { ["matahari-host", "matahari-net",
"matahari-service",
>> + "matahari-sysconfig", "matahari-lib",
"matahari-agent-lib",
>> + "matahari-broker", "matahari-devel",
"matahari"]:
>> + ensure => latest, require =>
[Yumrepo["fedora-updates"], Yumrepo["fedora"]] }
>> +
>> + service { [matahari-host, matahari-net, matahari-sysconfig, matahari-service,
>> + matahari-broker]: ensure => stopped, enable => true }
>> +}
>> diff --git a/contrib/puppet/matahari/manifests/util.pp
b/contrib/puppet/matahari/manifests/util.pp
>> new file mode 100644
>> index 0000000..4e2ced7
>> --- /dev/null
>> +++ b/contrib/puppet/matahari/manifests/util.pp
>> @@ -0,0 +1,14 @@
>> +$server = "puppet.example.com"
>> +
>> +define configfile(owner = root, group = root, mode = 644, source,
>> + backup = false, recurse = false, ensure = file) {
>> + file { $name:
>> + mode => $mode,
>> + owner => $owner,
>> + group => $group,
>> + backup => $backup,
>> + recurse => $recurse,
>> + ensure => $ensure,
>> + source => "puppet://$server/$source"
>> + }
>> +}
>> diff --git a/contrib/puppet/matahari/manifests/yum.pp
b/contrib/puppet/matahari/manifests/yum.pp
>> new file mode 100644
>> index 0000000..aecfe5c
>> --- /dev/null
>> +++ b/contrib/puppet/matahari/manifests/yum.pp
>> @@ -0,0 +1,12 @@
>> +yumrepo {
>> + "fedora" :
>> + mirrorlist =>
"https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch",
>> + enabled => 1, gpgcheck => 1,
>> + gpgkey =>
"file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch",
>> + require =>
File["/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch"];
>> + "fedora-updates" :
>> + mirrorlist =>
"https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch",
>> + enabled => 1, gpgcheck => 1,
>> + gpgkey =>
"file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch",
>> + require =>
File["/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch"]
>> +}
>> --
>> 1.7.6
>>
>> _______________________________________________
>> Matahari mailing list
>> Matahari(a)lists.fedorahosted.org
>>
https://fedorahosted.org/mailman/listinfo/matahari
>>
>