summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-05-12 14:27:06 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-05-12 14:27:06 -0400
commitaaf52ab85b518d8c6b4ed0211b69d6be531ae5a9 (patch)
treea7375f8be06af0faa3eeb3958f05578180ba8dbf
parentbdcdc5b244ea5deb35ff92787e1fb4068968d9dd (diff)
downloadthird_party-cobbler-aaf52ab85b518d8c6b4ed0211b69d6be531ae5a9.tar.gz
third_party-cobbler-aaf52ab85b518d8c6b4ed0211b69d6be531ae5a9.tar.xz
third_party-cobbler-aaf52ab85b518d8c6b4ed0211b69d6be531ae5a9.zip
Patch for replicate error handling + docs
-rw-r--r--CHANGELOG1
-rw-r--r--cobbler/action_replicate.py4
-rw-r--r--docs/cobbler.pod8
3 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 049ead8..95156a5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Cobbler CHANGELOG
- Mon May 12 2008 - 0.9.2
- run createrepo with less preconditions during cobbler reposync
+- doc upgrades and error handling for "cobbler replicate"
- Fri May 09 2008 - 0.9.1
- patch to allow yumopts to override gpgcheck
diff --git a/cobbler/action_replicate.py b/cobbler/action_replicate.py
index 139f18f..ae3adc8 100644
--- a/cobbler/action_replicate.py
+++ b/cobbler/action_replicate.py
@@ -17,6 +17,7 @@ import os
import os.path
import xmlrpclib
import api as cobbler_api
+from utils import _
class Replicate:
def __init__(self,config):
@@ -150,7 +151,8 @@ class Replicate:
self.uri = 'http://%s/cobbler_api' % cobbler_master
elif len(self.settings.cobbler_master) > 0:
self.uri = 'http://%s/cobbler_api' % self.settings.cobbler_master
-
+ else:
+ print _('No cobbler master found to replicate from, try --master.')
if self.uri is not None:
self.remote = xmlrpclib.Server(self.uri)
self.sync_distros()
diff --git a/docs/cobbler.pod b/docs/cobbler.pod
index 72836f0..ce5cb0d 100644
--- a/docs/cobbler.pod
+++ b/docs/cobbler.pod
@@ -399,6 +399,14 @@ Objects can also be renamed, as long as other objects don't reference them.
B<cobbler distro|profile|system|repo rename --name=oldname --newname=newname>
+=head2 REPLICATING
+
+Cobbler can replicate distro and profile data from a master cobbler server.
+
+B<cobbler replicate --master=cobbler.example.org>
+
+This will bring over all distro data for which it can find data in /var/www/cobbler/ks_mirror can be found. It will also bring over any default profiles for those distros. A default cobbler master can be set in the settings file. Tree data must still be rsync'd (or otherwise mirrored) manually.
+
=head2 REBUILDING CONFIGURATIONS
B<cobbler sync>