diff options
| author | James Laska <jlaska@redhat.com> | 2008-12-12 10:32:33 -0500 |
|---|---|---|
| committer | James Laska <jlaska@redhat.com> | 2008-12-12 10:32:33 -0500 |
| commit | f4393107f534daf3afa7990ac6d0aa08fff3e400 (patch) | |
| tree | 7df9963a5f0290ead191caae0ac2a6b1d56b2626 /installer_templates | |
| parent | 1ea3c1cf96e5828093cad38668f3e4c599638e78 (diff) | |
| parent | 21d1d81becbd6c801428555c1fe3984f9315a6cc (diff) | |
| download | cobbler-f4393107f534daf3afa7990ac6d0aa08fff3e400.tar.gz cobbler-f4393107f534daf3afa7990ac6d0aa08fff3e400.tar.xz cobbler-f4393107f534daf3afa7990ac6d0aa08fff3e400.zip | |
Merge commit 'origin/devel' into devel
Conflicts:
cobbler.spec
setup.py
Diffstat (limited to 'installer_templates')
| -rw-r--r-- | installer_templates/defaults | 4 | ||||
| -rw-r--r-- | installer_templates/settings.template | 27 |
2 files changed, 24 insertions, 7 deletions
diff --git a/installer_templates/defaults b/installer_templates/defaults index 34d5a0dc..ccd01063 100644 --- a/installer_templates/defaults +++ b/installer_templates/defaults @@ -6,6 +6,8 @@ enable_dhcp:0 enable_dns:0 next_server:'127.0.0.1' pxe_once:0 +redhat_management_type: "off" +redhat_management_server: "xmlrpc.rhn.redhat.com" +redhat_management_key: "" server:'127.0.0.1' -spacewalk_url:'http://localhost/rpc/api' yum_post_install_mirror:0 diff --git a/installer_templates/settings.template b/installer_templates/settings.template index 65afa59e..822c7fe6 100644 --- a/installer_templates/settings.template +++ b/installer_templates/settings.template @@ -209,6 +209,27 @@ pxe_just_once: $pxe_once # from what directory? pxe_template_dir: "/etc/cobbler/pxe" +# Are you using a Red Hat management platform in addition to Cobbler? +# Cobbler can help you register to it. Choose one of the following: +# +# "off" : I'm not using Red Hat Network, Satellite, or Spacewalk +# "hosted" : I'm using Red Hat Network +# "site" : I'm using Red Hat Satellite Server or Spacewalk +# +# You will also want to read: https://fedorahosted.org/cobbler/wiki/TipsForRhn +redhat_management_type: "$redhat_management_type" + +# if redhat_management_type is enabled, choose your server +# "management.example.org" : For Satellite or Spacewalk +# "xmlrpc.rhn.redhat.com" : For Red Hat Network +redhat_management_server: "$redhat_management_server" + +# specify the default Red Hat authorization key to use to register +# system. If left blank, no registration will be attempted. Similarly +# you can set the --redhat-management-key to blank on any system to +# keep it from trying to register. +redhat_management_key: "" + # when DHCP and DNS management are enabled, cobbler sync can automatically # restart those services to apply changes. The exception for this is # if using ISC for DHCP, then omapi eliminates the need for a restart. @@ -254,12 +275,6 @@ server: $server # this directory should not be required. snippetsdir: /var/lib/cobbler/snippets -# if modules.conf specifies authn_spacewalk, this is the XMLRPC -# endpoint to authenticate against. If Satellite/Spacewalk is -# not in use, ignore this setting entirely. -# See fedorahosted.org/spacewalk for details on that project. -spacewalk_url: $spacewalk_url - # by default, installs are set to send syslog traffic on this port # and cobblerd will listen on this port. syslog data (for installs # that support it... RHEL 5 and later, etc) is logged in /var/log/cobbler |