rel-eng/packages utils/spacewalk-utils.spec
by Dimitar Yordanov
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4eaf1a566d335f043120715ace8c07ed7ccdff24
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Tue Jul 30 18:03:20 2013 +0200
Automatic commit of package [spacewalk-utils] release [2.1.1-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 3b322fb..35bd7b1 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-2.0.2-1 utils/
+2.1.1-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 52680a2..8654488 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 2.1.0
+Version: 2.1.1
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -88,6 +88,10 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Tue Jul 30 2013 Dimitar Yordanov <dyordano(a)redhat.com> 2.1.1-1
+- New simple tool for managing custom repositories.
+- Bumping package versions for 2.1.
+
* Thu Jul 18 2013 Jiri Mikulka <jmikulka(a)redhat.com> 2.0.2-1
- dropping support for Fedora 17 in Spacewalk nightly
10 years, 2 months
utils/Makefile utils/spacewalk-custom-repository
by Dimitar Yordanov
utils/Makefile | 2
utils/spacewalk-custom-repository | 341 ++++++++++++++++++++++++++++++++++++++
2 files changed, 342 insertions(+), 1 deletion(-)
New commits:
commit 74dd1da66db0fafc70ed466a93fa67f654d23dee
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Tue Jul 30 18:01:09 2013 +0200
New simple tool for managing custom repositories.
diff --git a/utils/Makefile b/utils/Makefile
index 20a9432..b2c09b4 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -7,7 +7,7 @@ NAME := spacewalk-utils
SUBDIR = utils
FILES = __init__ systemSnapshot migrateSystemProfile depsolver cloneByDate
-SCRIPTS = sw-system-snapshot migrate-system-profile spacewalk-api apply_errata \
+SCRIPTS = spacewalk-custom-repository sw-system-snapshot migrate-system-profile spacewalk-api apply_errata \
scr.cgi spacewalk-common-channels delete-old-systems-interactive spacewalk-hostname-rename \
spacewalk-dump-schema spacewalk-clone-by-date
CONFIGS = spacewalk-common-channels.ini
diff --git a/utils/spacewalk-custom-repository b/utils/spacewalk-custom-repository
new file mode 100755
index 0000000..7de9aa1
--- /dev/null
+++ b/utils/spacewalk-custom-repository
@@ -0,0 +1,341 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2010--2012 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+#
+# dyordano(a)redhat.com
+
+import sys
+import xmlrpclib
+import fnmatch
+import ConfigParser
+from optparse import OptionParser, Option
+import re
+from spacewalk.common.cli import getUsernamePassword, xmlrpc_login, xmlrpc_logout
+
+DEFAULT_SERVER = "localhost"
+DEFAULT_USER = "admin"
+DEFAULT_PASSWORD = "nimda"
+
+exit_code=0
+
+#mmraka
+CHANNEL_ARCH = {
+ 'i386': 'channel-ia32',
+ 'ia64': 'channel-ia64',
+ 'sparc': 'channel-sparc',
+ 'sparc64': 'channel-sparc64',
+ 'alpha': 'channel-alpha',
+ 's390': 'channel-s390',
+ 's390x': 'channel-s390x',
+ 'iSeries': 'channel-iSeries',
+ 'pSeries': 'channel-pSeries',
+ 'x86_64': 'channel-x86_64',
+ 'ppc': 'channel-ppc',
+ 'ppc64': 'channel-ppc64',
+ 'sparc-sun-solaris': 'channel-sparc-sun-solaris',
+ 'i386-sun-solaris': 'channel-i386-sun-solaris',
+ }
+
+class ExtOptionParser(OptionParser):
+
+ """extend OptionParser to print examples"""
+ def __init__(self, examples=None, **kwargs):
+ self.examples = examples
+ OptionParser.__init__(self, **kwargs)
+ def print_help(self):
+ OptionParser.print_help(self)
+ print "\n\n" + self.examples
+
+def connect(user, password, server):
+ server_url = "http://%s/rpc/api" % server
+
+ if options.verbose > 2:
+ client_verbose = options.verbose - 2
+ else:
+ client_verbose = 0
+ if options.verbose:
+ sys.stdout.write("Connecting to %s\n" % server_url)
+ client = xmlrpclib.Server(server_url, verbose=client_verbose, allow_none=1)
+ user, password = getUsernamePassword(user, password)
+ key = xmlrpc_login(client, user, password)
+ return client, key
+
+def f_print_error(msg):
+ global exit_code
+ print "ERROR: %s\n" % msg
+ exit_code+=1
+
+def f_print_info(msg):
+ print "INFO: %s\n" % msg
+
+if __name__ == "__main__":
+ # options parsing
+ usage = "usage: %prog --action [params]"
+ examples = """Examples:
+
+ List all available repositoies:
+ %(prog)s --list-repos
+
+ Create software channel:
+ %(prog)s --create-channel --channel-label example_channel --channel-name example_name --channel-summary example_summary --channel-arch x86_64 --channel-parent example_parent
+
+ %(prog)s --create-channel --channel-label example_channel --channel-name example_name --channel-summary example_summary --channel-arch x86_64 --channel-parent example_parent --channel-checksum sha256
+
+ %(prog)s --create-channel --channel-label example_channel --channel-name example_name --channel-summary example_summary --channel-arch x86_64 --channel-parent example_parent --channel-checksum sha256 --channel-gpgKey-url http://example.com/gpg_key --channel-gpgKey-id 069C8460 --channel-gpgKey-fingerprint "25DB B54B DED7 0987 F4C1 0042 B4EB F579 069C 8460"
+
+ Create repository:
+ %(prog)s --create-repo --repo-label example_repo --repo-url http://example.redhat.com/example_repo
+
+ Update Repository Url:
+ %(prog)s --update-repourl --repo-label example_repo --repo-url http://example.redhat.com/example_repo_updated
+
+ Delete repository:
+ %(prog)s --delete-repo --repo-label example_repo
+
+ Associate repository to a custom software channel:
+ %(prog)s --associate-repo --repo-label example_repo --channel-label example_channel
+
+ Disassociate repository to a custom software channel:
+ %(prog)s --disassociate-repo --repo-label example_repo --channel-label example_channel
+
+ Add filter to a repository:
+ %(prog)s --add-filter --repo-label example_repo --filter-string example_filter_string* --filter-flag +
+
+ Remove filter from a repository:
+ %(prog)s --remove-filter --repo-label example_repo --filter-string example_filter_string* --filter-flag +
+
+ Clear filters for a repository:
+ %(prog)s --clear-filters --repo-label example_repo
+
+ List all filter for a repository:
+ %(prog)s --list-filters --repo-label example_repo
+
+ List all associated repositories for a custom software channel:
+ %(prog)s --list-channels-repos --channel-label example_channel
+
+ List all available custom sofware channels:
+ %(prog)s --list-channels
+
+ Sync custom sofware channel with all associated repositories:
+ %(prog)s --sync-now --channel-label example_channel
+
+\n""" % {'prog': sys.argv[0]}
+
+ option_list = [
+ Option("-u", "--user", help="Spacewalk username", default=DEFAULT_USER),
+ Option("-p", "--password", help="Spacewalk password", default=DEFAULT_PASSWORD),
+ Option("-s", "--server", help="Spacewalk server Url", default=DEFAULT_SERVER),
+ Option("-v", "--verbose", help="verbose", action="count"),
+ Option("", "--channel-label", help="Software channel label"),
+ Option("", "--channel-name", help="Software channel name"),
+ Option("", "--channel-summary", help="Software channel summary"),
+ Option("", "--channel-arch", help="Software channel architecture"),
+ Option("", "--channel-parent", help="Software channel parent"),
+ Option("", "--channel-checksum", help="Software channel checksum sha1,sha256"),
+ Option("", "--channel-gpgKey-url", help="Software channel gpgKey url"),
+ Option("", "--channel-gpgKey-id", help="Software channel gpgKey id"),
+ Option("", "--channel-gpgKey-fingerprint", help="Software channel gpgKey fingerprint"),
+ Option("", "--repo-label", help="Repository Label"),
+ Option("", "--repo-url", help="Repository Url"),
+ Option("", "--filter-string", help="filter string"),
+ Option("", "--filter-flag", help="filter flag"),
+ Option("", "--list-repos", help="Action: List available repositories", action="store_true"),
+ Option("", "--list-channels", help="Action: List available software channels", action="store_true"),
+ Option("", "--list-channels-repos", help="Action: List repositories associated with a channel. Requites --channel-label", action="store_true"),
+ Option("", "--list-filters", help="Action: List filtes for repository. Requites --repo-label", action="store_true"),
+ Option("", "--create-channel", help="Action: Create software channel. Requites label, name, summary, arch", action="store_true"),
+ Option("", "--create-repo", help="Action: Create repository. Requites --repo-label --repo-url", action="store_true"),
+ Option("", "--delete-repo", help="Action: Delete repository. Requites --repo-label", action="store_true"),
+ Option("", "--associate-repo", help="Action: Associate repository. Requites --repo-label --channel-label", action="store_true"),
+ Option("", "--disassociate-repo", help="Action: Associate repository. Requites --repo-label --channel-label", action="store_true"),
+ Option("", "--add-filter", help="Action: Add filter to repository. Requites --filter-string --filter-flag --repo-label", action="store_true"),
+ Option("", "--remove-filter", help="Action: Remove filter from repository. Requites --filter-string --filter-flag --repo-label", action="store_true"),
+ Option("", "--clear-filters", help="Action: Clear filters for repository. Requites --repo-label", action="store_true"),
+ Option("", "--sync-now", help="Action: Sync software channel with all associated repositories. Requites --channel-label", action="store_true"),
+ Option("", "--update-repourl", help="Action: Update repsitory Url. Requites --repo-label --repo-url", action="store_true"),
+ Option("", "--list_arch", help="Action: List available architectures.", action="store_true"),
+
+ ]
+
+ parser = ExtOptionParser(usage=usage, option_list=option_list, examples=examples)
+ (options, args) = parser.parse_args()
+
+ try:
+ client, key = connect(options.user, options.password, options.server)
+ except xmlrpclib.Fault, e:
+ if e.faultCode == 2950:
+ sys.stderr.write("Either the password or username is incorrect.\n")
+ sys.exit(2)
+ else:
+ raise
+
+ try:
+ # List Repos
+ if options.list_repos:
+ l_repo=client.channel.software.listUserRepos(key)
+ for repo in l_repo:
+ print "| %s | %s | id: %d" % (repo['label'],repo['sourceUrl'],repo['id'])
+
+ # List Channel
+ if options.list_channels:
+ d_parents={}
+ l_ch=client.channel.listSoftwareChannels(key)
+ for ch in l_ch:
+ if ch['parent_label'] == '':
+ if ch['label'] not in d_parents.keys():
+ d_parents[ch['label']]=[]
+ continue
+
+ if ch['parent_label'] not in d_parents.keys():
+ d_parents[ch['parent_label']]=[]
+
+ d_parents[ch['parent_label']].append(ch['label'])
+
+
+ keys = d_parents.keys()
+ keys.sort()
+ for ch in keys:
+ print ch
+ for sub in d_parents[ch]:
+ print "\t" + sub
+
+ # List Channels Repos
+ if options.list_channels_repos:
+ if options.channel_label != None:
+ l_repos=client.channel.software.listChannelRepos(key, options.channel_label)
+ for repo in l_repos:
+ print "| %s | %s | id: %d" % (repo['label'],repo['sourceUrl'],repo['id'])
+ else:
+ f_print_error("Obligatory param --channel-label is missing.")
+
+ # List arch
+ if options.list_arch:
+ for arch in CHANNEL_ARCH.keys():
+ print arch
+
+ # Create Channel
+ if options.create_channel:
+ if options.channel_label != None and \
+ options.channel_name != None and \
+ options.channel_summary != None and \
+ options.channel_arch != None :
+ client.channel.software.create(key,options.channel_label,
+ options.channel_name,
+ options.channel_summary,
+ CHANNEL_ARCH[options.channel_arch],
+ options.channel_parent,
+ options.channel_checksum,
+ {'url':options.channel_gpgKey_url,'id':options.channel_gpgKey_id,'fingerprint':options.channel_gpgKey_fingerprint} )
+ else:
+ f_print_error("One or more obligatory params are missing - Label, Name, Summary or Arch.")
+
+ # Create Repo
+ if options.create_repo:
+ client.channel.software.createRepo(key,
+ options.repo_label, 'yum',
+ options.repo_url)
+
+ # Delete Repo
+ if options.delete_repo:
+ if options.repo_label != None:
+ client.channel.software.removeRepo(key, options.repo_label)
+ else:
+ f_print_error("Obligatory param --repo_label is missing.")
+
+ # Associate Repo to Channel
+ if options.associate_repo:
+ if options.channel_label != None and options.repo_label != None:
+ # check if not alredy associated
+ flag=0
+ l_repos=client.channel.software.listChannelRepos(key, options.channel_label)
+ for repo in l_repos:
+ if repo['label'] == options.repo_label:
+ flag=1;break
+ if flag == 0:
+ client.channel.software.associateRepo(key,
+ options.channel_label, options.repo_label)
+ else:
+ f_print_info("Repo: %s already is associated with the channel: %s. Nothing to do." % (options.repo_label,options.channel_label))
+ else:
+ f_print_error("One or more obligatory params are missing: --channel-label --repo-label.")
+
+ # Disassociate Repo to Channel
+ if options.disassociate_repo:
+ if options.channel_label != None and options.repo_label != None:
+ client.channel.software.disassociateRepo(key,
+ options.channel_label, options.repo_label)
+ else:
+ f_print_error("One or more obligatory params are missing: --channel-label --repo-label.")
+
+ # List Filters for Repo
+ if options.list_filters:
+ if options.repo_label != None:
+ l_filters=client.channel.software.listRepoFilters(key,options.repo_label)
+ for filter in l_filters:
+ print "| %s | %s | sortOrder: %d" % (filter['filter'],filter['flag'],filter['sortOrder'])
+ else:
+ f_print_error("Obligatory param --repo-label is missing.")
+
+ # Add Filter to Repo
+ if options.add_filter:
+ if options.repo_label != None and options.filter_string != None and \
+ (options.filter_flag == '-' or options.filter_flag == '+'):
+ client.channel.software.addRepoFilter(key,options.repo_label,{'filter':options.filter_string,'flag':options.filter_flag})
+ else:
+ if options.filter_flag == '-' and options.filter_flag == '+':
+ f_print_error("One or more obligatory params are missing: --repo-label --filter-string --filter-flag")
+ else:
+ f_print_error("Parameter flag accept only values + or -.")
+
+ # Remove Filter from Repo
+ if options.remove_filter:
+ if options.repo_label != None and options.filter_string != None and \
+ (options.filter_flag == '-' or options.filter_flag == '+'):
+ client.channel.software.removeRepoFilter(key,options.repo_label,{'filter':options.filter_string,'flag':options.filter_flag})
+ else:
+ if options.filter_flag == '-' and options.filter_flag == '+':
+ f_print_error("One or more obligatory params are missing: --repo-label --filter-string --filter-flag")
+ else:
+ f_print_error("Parameter flag accept only values + or -.")
+
+ # Clear Filtes for Repo
+ if options.clear_filters:
+ if options.repo_label != None:
+ client.channel.software.clearRepoFilters(key,options.repo_label)
+ else:
+ f_print_error("Obligatory param --repo-label is missing.")
+
+ # Sync channel with all repos
+ if options.sync_now:
+ if options.channel_label != None:
+ client.channel.software.syncRepo(key,options.channel_label)
+ else:
+ f_print_error("Obligatory param --channel-label is missing.")
+
+ #Update Repo Url
+ if options.update_repourl:
+ if options.repo_url != None:
+ client.channel.software.updateRepoUrl(key,options.repo_label,options.repo_url)
+ else:
+ f_print_error("Obligatory param --repo-url is missing.")
+
+ except xmlrpclib.Fault, e:
+ f_print_error(e.faultString)
+
+
+ if client is not None:
+ # logout
+ xmlrpc_logout(client, key)
+
+ sys.exit(exit_code)
10 years, 2 months
Changes to 'refs/tags/spacewalk-setup-2.1.3-1'
by Michael Mraka
Tag 'spacewalk-setup-2.1.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-07-30 12:32 +0000
Tagging package [spacewalk-setup] version [2.1.3-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-2.1.2-1:
Michael Mraka (3):
fixed spaces
recognize external/embedded variant
Automatic commit of package [spacewalk-setup] release [2.1.3-1].
---
rel-eng/packages/spacewalk-setup | 2 -
satellite/install/install.pl | 4 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 59 ++++++++++++++++++---------------
spacewalk/setup/spacewalk-setup.spec | 5 ++
4 files changed, 41 insertions(+), 29 deletions(-)
---
10 years, 2 months
3 commits - rel-eng/packages satellite/install spacewalk/setup
by Michael Mraka
rel-eng/packages/spacewalk-setup | 2 -
satellite/install/install.pl | 4 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 59 ++++++++++++++++++---------------
spacewalk/setup/spacewalk-setup.spec | 5 ++
4 files changed, 41 insertions(+), 29 deletions(-)
New commits:
commit b6b83b304514ba2cfeaccaa634dfe46bbcb4a95f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jul 30 14:32:58 2013 +0200
Automatic commit of package [spacewalk-setup] release [2.1.3-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index f9356e4..23953c3 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-2.1.2-1 spacewalk/setup/
+2.1.3-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 9b43b29..f6430bf 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 2.1.2
+Version: 2.1.3
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Tue Jul 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1
+- recognize external/embedded variant
+
* Wed Jul 24 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1
- single parameter system_debug is not supported
commit 3497675cb89269b5ed73d05acf727919237c65b2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Mar 26 13:40:13 2013 +0100
recognize external/embedded variant
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index 5aae338..1e63bb2 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -47,7 +47,9 @@ my %up2dateOptions = ();
my %rhnOptions = ();
my @additionalOptions = ();
# read existing confgiuration
-Spacewalk::Setup::read_config(DEFAULT_UP2DATE_CONF_LOCATION, \%up2dateOptions);
+if (-e DEFAULT_UP2DATE_CONF_LOCATION) {
+ Spacewalk::Setup::read_config(DEFAULT_UP2DATE_CONF_LOCATION, \%up2dateOptions);
+}
if (-e Spacewalk::Setup::DEFAULT_RHN_CONF_LOCATION) {
Spacewalk::Setup::read_config(Spacewalk::Setup::DEFAULT_RHN_CONF_LOCATION, \%rhnOptions);
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 266d606..271d48f 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -123,7 +123,8 @@ sub parse_options {
"run-updater:s",
"run-cobbler",
"enable-tftp:s",
- "external-db",
+ "external-oracle",
+ "external-postgresql",
"db-only",
"rhn-http-proxy:s",
"rhn-http-proxy-username:s",
@@ -133,7 +134,7 @@ sub parse_options {
my $usage = loc("usage: %s %s\n",
$0,
- "[ --help ] [ --answer-file=<filename> ] [ --non-interactive ] [ --skip-system-version-test ] [ --skip-selinux-test ] [ --skip-fqdn-test ] [ --skip-db-install ] [ --skip-db-diskspace-check ] [ --skip-db-population ] [ --skip-gpg-key-import ] [ --skip-ssl-cert-generation ] [--skip-ssl-vhost-setup] [ --skip-services-check ] [ --clear-db ] [ --re-register ] [ --disconnected ] [ --upgrade ] [ --run-updater=<yes|no>] [--run-cobbler] [ --enable-tftp=<yes|no>] [--external-db]" );
+ "[ --help ] [ --answer-file=<filename> ] [ --non-interactive ] [ --skip-system-version-test ] [ --skip-selinux-test ] [ --skip-fqdn-test ] [ --skip-db-install ] [ --skip-db-diskspace-check ] [ --skip-db-population ] [ --skip-gpg-key-import ] [ --skip-ssl-cert-generation ] [--skip-ssl-vhost-setup] [ --skip-services-check ] [ --clear-db ] [ --re-register ] [ --disconnected ] [ --upgrade ] [ --run-updater=<yes|no>] [--run-cobbler] [ --enable-tftp=<yes|no>] [ --external-oracle | --external-postgresql ]" );
# Terminate if any errors were encountered parsing the command line args:
my %opts;
@@ -222,7 +223,9 @@ sub load_answer_file {
# Check if we're installing with an embedded database.
sub is_embedded_db {
my $opts = shift;
- return not (defined($opts->{'external-db'}) or defined($opts->{'managed-db'}));
+ return not (defined($opts->{'external-oracle'})
+ or defined($opts->{'external-postgresql'})
+ or defined($opts->{'managed-db'}));
}
sub contains_embedded_oracle {
@@ -1003,7 +1006,7 @@ sub postgresql_setup_embedded_db {
if (not -x '/usr/bin/spacewalk-setup-postgresql') {
print loc(<<EOQ);
The spacewalk-setup-postgresql does not seem to be available.
-You might want to use --external-db command line option.
+You might want to use --external-oracle or --external-postgresql command line option.
EOQ
exit 24;
}
@@ -2046,9 +2049,13 @@ Only runs the necessary steps to setup cobbler
Set to 'yes' to automatically enable tftp and xinetd services needed for Cobbler PXE provisioning functionality. Set to 'no' if you do not want the installer to enable these services.
-=item B<--external-db>
+=item B<--external-oracle>
-Assume the Red Hat Satellite installation uses an external database (Red Hat Satellite only).
+Assume the Red Hat Satellite installation uses an external Oracle database (Red Hat Satellite only).
+
+=item B<--external-postgresql>
+
+Assume the Red Hat Satellite installation uses an external PostgreSQL database (Red Hat Satellite only).
=back
commit 09572890b824fe39a5a194a94753d748510c7651
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Mar 28 09:57:49 2013 +0100
fixed spaces
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 38ff7db..266d606 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -100,31 +100,31 @@ $DEBUG = 0;
sub parse_options {
my @valid_opts = (
- "help",
- "skip-system-version-test",
- "skip-selinux-test",
- "skip-fqdn-test",
- "skip-python-test",
- "skip-updates-install",
- "skip-db-install",
- "skip-db-diskspace-check",
- "skip-db-population",
- "skip-gpg-key-import",
- "skip-ssl-cert-generation",
- "skip-ssl-vhost-setup",
+ "help",
+ "skip-system-version-test",
+ "skip-selinux-test",
+ "skip-fqdn-test",
+ "skip-python-test",
+ "skip-updates-install",
+ "skip-db-install",
+ "skip-db-diskspace-check",
+ "skip-db-population",
+ "skip-gpg-key-import",
+ "skip-ssl-cert-generation",
+ "skip-ssl-vhost-setup",
"skip-services-check",
"skip-logfile-init",
- "clear-db",
- "re-register",
- "disconnected",
- "answer-file=s",
- "non-interactive",
- "upgrade",
- "run-updater:s",
+ "clear-db",
+ "re-register",
+ "disconnected",
+ "answer-file=s",
+ "non-interactive",
+ "upgrade",
+ "run-updater:s",
"run-cobbler",
"enable-tftp:s",
- "external-db",
- "db-only",
+ "external-db",
+ "db-only",
"rhn-http-proxy:s",
"rhn-http-proxy-username:s",
"rhn-http-proxy-password:s",
10 years, 2 months
Changes to 'refs/tags/spacewalk-backend-2.1.2-1'
by StephenHerr
Tag 'spacewalk-backend-2.1.2-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-07-29 22:09 +0000
Tagging package [spacewalk-backend] version [2.1.2-1] in directory [backend/].
Changes since spacewalk-java-2.1.8-1:
Stephen Herr (2):
960550 - the "Deploy confguration files" box is never checked for kickstarts
Automatic commit of package [spacewalk-backend] release [2.1.2-1].
---
backend/server/rhnServer/server_kickstart.py | 39 ++++++++++++++++-----------
backend/spacewalk-backend.spec | 5 ++-
rel-eng/packages/spacewalk-backend | 2 -
3 files changed, 29 insertions(+), 17 deletions(-)
---
10 years, 2 months
2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr
backend/server/rhnServer/server_kickstart.py | 39 ++++++++++++++++-----------
backend/spacewalk-backend.spec | 5 ++-
rel-eng/packages/spacewalk-backend | 2 -
3 files changed, 29 insertions(+), 17 deletions(-)
New commits:
commit 53dad0192e09b740eb00377de48c229aaf21f2a6
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Jul 29 18:09:09 2013 -0400
Automatic commit of package [spacewalk-backend] release [2.1.2-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 9007251..50c284e 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.1
+Version: 2.1.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -639,6 +639,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Jul 29 2013 Stephen Herr <sherr(a)redhat.com> 2.1.2-1
+- 960550 - the "Deploy confguration files" box is never checked for kickstarts
+
* Thu Jul 25 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.1-1
- 803837 - process includepkgs and exclude from yum.conf
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 6346bd8..2723f41 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.1-1 backend/
+2.1.2-1 backend/
commit 97cc5ff73e34f6ee8ac72160392d812466fab015
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Jul 29 18:08:46 2013 -0400
960550 - the "Deploy confguration files" box is never checked for kickstarts
diff --git a/backend/server/rhnServer/server_kickstart.py b/backend/server/rhnServer/server_kickstart.py
index 66bf336..4b60379 100644
--- a/backend/server/rhnServer/server_kickstart.py
+++ b/backend/server/rhnServer/server_kickstart.py
@@ -304,6 +304,28 @@ def schedule_virt_pkg_install(server_id, kickstart_session_id):
return action_id
+_query_ak_deploy_config = rhnSQL.Statement("""
+select rt.deploy_configs
+ from rhnKickstartSession ks,
+ rhnKickstartDefaultRegToken kdrt,
+ rhnRegToken rt
+ where ks.kickstart_id = kdrt.kickstart_id
+ and kdrt.regtoken_id = rt.id
+ and ks.id = :session_id
+""")
+# Make sure the activation keys associated with this kickstart profile
+# have enabled deploying config files. Only deploy configs if at least one
+# of them has. This is replacing code that didn't work because the
+# rhnFlags('registration_token') could not be set during the rhn_check call.
+def ks_activation_key_deploy_config(kickstart_session_id):
+ h = rhnSQL.prepare(_query_ak_deploy_config)
+ h.execute(session_id=kickstart_session_id)
+ rows = h.fetchall_dict()
+ for row in rows:
+ if row['deploy_configs'] and row['deploy_configs'] == 'Y':
+ return True
+ return False
+
_query_schedule_config_files = rhnSQL.Statement("""
insert into rhnActionConfigRevision
(id, action_id, server_id, config_revision_id)
@@ -334,7 +356,8 @@ def schedule_config_deploy(server_id, action_id, kickstart_session_id,
row = get_kickstart_session_info(kickstart_session_id, server_id)
org_id = row['org_id']
scheduler = row['scheduler']
- deploy_configs = (row['deploy_configs'] == 'Y')
+ deploy_configs = (row['deploy_configs'] == 'Y'
+ and ks_activation_key_deploy_config(kickstart_session_id))
if not deploy_configs:
# Nothing more to do here
@@ -349,20 +372,6 @@ def schedule_config_deploy(server_id, action_id, kickstart_session_id,
else:
aid = action_id
- tokens_obj = rhnFlags.get("registration_token")
- if not tokens_obj:
- log_debug(3, "Failed to get the registration_token")
- return aid
- else:
- tokens_obj = rhnFlags.get("registration_token")
- deployment = False
- for token in tokens_obj.tokens:
- if token['deploy_configs'] == 'Y':
- deployment = True
- break
- if not deployment:
- return aid
-
next_action_id = rhnAction.schedule_server_action(
server_id,
action_type='configfiles.deploy',
10 years, 2 months
Changes to 'refs/tags/spacewalk-java-2.1.8-1'
by StephenHerr
Tag 'spacewalk-java-2.1.8-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-07-29 16:59 +0000
Tagging package [spacewalk-java] version [2.1.8-1] in directory [java/].
Changes since rhnmd-5.3.18-1:
Stephen Herr (2):
989630 - Allow user to hackisly add their own keys during the kickstart
Automatic commit of package [spacewalk-java] release [2.1.8-1].
---
java/conf/cobbler/snippets/post_reactivation_key | 9 ++++++++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
---
10 years, 2 months
2 commits - java/conf java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/conf/cobbler/snippets/post_reactivation_key | 9 ++++++++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 593eacd6f0d89c2864e972eda54236d68c1defd5
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Jul 29 12:59:16 2013 -0400
Automatic commit of package [spacewalk-java] release [2.1.8-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f91b564..7cde342 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.7
+Version: 2.1.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -771,6 +771,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jul 29 2013 Stephen Herr <sherr(a)redhat.com> 2.1.8-1
+- 989630 - Allow user to hackisly add their own keys during the kickstart
+
* Thu Jul 25 2013 Grant Gainey <ggainey(a)redhat.com> 2.1.7-1
- 987977 - Fix there-can-be-solaris issue and make Upgrade behave like
everything else
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index cf5150a..390da2c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.7-1 java/
+2.1.8-1 java/
commit 874edc119d880b15878722be68f9afc27bd9e433
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Jul 29 12:58:55 2013 -0400
989630 - Allow user to hackisly add their own keys during the kickstart
diff --git a/java/conf/cobbler/snippets/post_reactivation_key b/java/conf/cobbler/snippets/post_reactivation_key
index 369deab..907a75e 100644
--- a/java/conf/cobbler/snippets/post_reactivation_key
+++ b/java/conf/cobbler/snippets/post_reactivation_key
@@ -6,6 +6,7 @@ try:
import os.path
old_system_id = "/tmp/rhn/systemid"
new_system_id = "/mnt/sysimage/root/systemid.old"
+ tmp_key = "/mnt/sysimage/tmp/key"
new_keys = "$redhat_management_key"
for key in new_keys.split(','):
@@ -14,7 +15,13 @@ try:
if os.path.exists(old_system_id):
client = xmlrpclib.Server("http://$redhat_management_server/rpc/api")
key = client.system.obtain_reactivation_key(open(old_system_id).read())
- f = open("/mnt/sysimage/tmp/key","w")
+ if os.path.exists(tmp_key):
+ f = open(tmp_key, "r+")
+ contents = f.read()
+ if contents and not contents[-1] == ',':
+ f.write(',')
+ else:
+ f = open(tmp_key, "w")
f.write(key)
f.close()
shutil.copy(old_system_id, new_system_id)
10 years, 2 months
Changes to 'refs/tags/rhnmd-5.3.18-1'
by Michael Mraka
Tag 'rhnmd-5.3.18-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-07-29 12:46 +0000
Tagging package [rhnmd] version [5.3.18-1] in directory [monitoring/rhnmd/].
Changes since spacewalk-schema-2.1.4-1:
Michael Mraka (2):
893096 - bind rhnmd to port on new RHEL
Automatic commit of package [rhnmd] release [5.3.18-1].
---
monitoring/rhnmd/rhnmd.spec | 7 +++++--
rel-eng/packages/rhnmd | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
10 years, 2 months
2 commits - monitoring/rhnmd rel-eng/packages
by Michael Mraka
monitoring/rhnmd/rhnmd.spec | 7 +++++--
rel-eng/packages/rhnmd | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit cb6c212c9f17baa9f5cb16441b42ba07bea369fc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jul 29 14:46:07 2013 +0200
Automatic commit of package [rhnmd] release [5.3.18-1].
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index cc4af4a..3574bd5 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -9,7 +9,7 @@ Summary: Spacewalk Monitoring Daemon
Name: rhnmd
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.3.17
+Version: 5.3.18
Release: 1%{?dist}
License: GPLv2
BuildArch: noarch
@@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Mon Jul 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 5.3.18-1
+- 893096 - bind rhnmd to port on new RHEL
+
* Tue May 21 2013 Tomas Kasparek <tkasparek(a)redhat.com> 5.3.17-1
- misc branding clean up
diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd
index 325cceb..3d9fefe 100644
--- a/rel-eng/packages/rhnmd
+++ b/rel-eng/packages/rhnmd
@@ -1 +1 @@
-5.3.17-1 monitoring/rhnmd/
+5.3.18-1 monitoring/rhnmd/
commit 735a8220c954186373fcf4c640002c513df84673
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jul 29 14:38:15 2013 +0200
893096 - bind rhnmd to port on new RHEL
fixing
type=AVC msg=audit(1375100630.341:771): avc: denied { name_bind } for pid=19076 comm="rhnmd" src=4545 scontext=system_u:system_r:sshd_t:s0-s0:c0.c1023 tcontext=system_u:object_r:unreserved_port_t:s0 tclass=tcp_socket
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index f12618a..cc4af4a 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -140,7 +140,7 @@ fi
/usr/sbin/semanage fcontext -a -t ssh_home_t '/var/lib/nocpulse/\.ssh/authorized_keys' || :
%endif
/sbin/restorecon -rvv /var/lib/nocpulse || :
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 6
/usr/sbin/semanage port -l | grep -q '^ssh_port_t\b.*\btcp\b.*\b4545\b' || /usr/sbin/semanage port -a -t ssh_port_t -p tcp 4545 || :
%endif
%endif
10 years, 2 months