spacewalk-commits August 2012

spacewalk-commits@lists.fedorahosted.org

9 participants
192 discussions

Changes to 'refs/tags/spacewalk-setup-jabberd-1.8.5-1'
by Miroslav Suchý 27 Aug '12

27 Aug '12

Tag 'spacewalk-setup-jabberd-1.8.5-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-08-27 08:27 +0000 Tagging package [spacewalk-setup-jabberd] version [1.8.5-1] in directory [spacewalk/spacewalk-setup-jabberd/]. Changes since spacewalk-backend-1.8.62-1: Miroslav Suchý (2): 807479 - correct description Automatic commit of package [spacewalk-setup-jabberd] release [1.8.5-1]. --- rel-eng/packages/spacewalk-setup-jabberd | 2 +- spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

rel-eng/packages spacewalk/spacewalk-setup-jabberd
by Miroslav Suchý 27 Aug '12

27 Aug '12

rel-eng/packages/spacewalk-setup-jabberd | 2 +- spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 674b1a3eaca1a5c73061e63fdb29011487a53d34 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Aug 27 10:27:51 2012 +0200 Automatic commit of package [spacewalk-setup-jabberd] release [1.8.5-1]. diff --git a/rel-eng/packages/spacewalk-setup-jabberd b/rel-eng/packages/spacewalk-setup-jabberd index 99d7268..2dc326f 100644 --- a/rel-eng/packages/spacewalk-setup-jabberd +++ b/rel-eng/packages/spacewalk-setup-jabberd @@ -1 +1 @@ -1.8.4-1 spacewalk/spacewalk-setup-jabberd/ +1.8.5-1 spacewalk/spacewalk-setup-jabberd/ diff --git a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec index ccb6939..a222f4e 100644 --- a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec +++ b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup-jabberd -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} Summary: Tools to setup jabberd for Spacewalk Group: Applications/System @@ -57,6 +57,9 @@ rm -rf %{buildroot} %{_sysconfdir}/pki/spacewalk %changelog +* Mon Aug 27 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.5-1 +- 807479 - correct description + * Wed Aug 22 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.4-1 - 800297 - s2s: enable resolve-ipv6

1 0

spacewalk/spacewalk-setup-jabberd
by Miroslav Suchý 27 Aug '12

27 Aug '12

spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b07d6c966399df3fa5c5a2ef8216dc6336378c0a Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Mon Aug 27 10:27:16 2012 +0200 807479 - correct description diff --git a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec index 45fd98b..ccb6939 100644 --- a/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec +++ b/spacewalk/spacewalk-setup-jabberd/spacewalk-setup-jabberd.spec @@ -16,7 +16,7 @@ Requires: jabberd Requires: %{_datadir}/spacewalk %description -Script, which setup Jabberd for Spacewalk. Used during installation of +Script, which sets up Jabberd for Spacewalk. Used during installation of Spacewalk server or Spacewalk proxy. %prep

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.62-1'
by aparsons 26 Aug '12

26 Aug '12

Tag 'spacewalk-backend-1.8.62-1' created by Aron Parsons <aronparsons(a)gmail.com> at 2012-08-26 17:12 +0000 Tagging package [spacewalk-backend] version [1.8.62-1] in directory [backend/]. Changes since spacewalk-java-1.8.134-1: Aron Parsons (2): add --no-errata option to spacewalk-repo-sync Automatic commit of package [spacewalk-backend] release [1.8.62-1]. --- backend/satellite_tools/reposync.py | 7 +++++-- backend/satellite_tools/spacewalk-repo-sync | 5 ++++- backend/satellite_tools/spacewalk-repo-sync.sgml | 10 ++++++++++ backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 5 files changed, 24 insertions(+), 5 deletions(-) ---

1 0

2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by aparsons 26 Aug '12

26 Aug '12

backend/satellite_tools/reposync.py | 7 +++++-- backend/satellite_tools/spacewalk-repo-sync | 5 ++++- backend/satellite_tools/spacewalk-repo-sync.sgml | 10 ++++++++++ backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 5 files changed, 24 insertions(+), 5 deletions(-) New commits: commit f8b731db9eeafad9f9227c74fa01a9bf196a869f Author: Aron Parsons <aronparsons(a)gmail.com> Date: Sun Aug 26 13:12:26 2012 -0400 Automatic commit of package [spacewalk-backend] release [1.8.62-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 210af47..c7e00b1 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: 1.8.61 +Version: 1.8.62 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -647,6 +647,9 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Sun Aug 26 2012 Aron Parsons <aronparsons(a)gmail.com> 1.8.62-1 +- add --no-errata option to spacewalk-repo-sync + * Tue Aug 21 2012 Stephen Herr <sherr(a)redhat.com> 1.8.61-1 - 848475 - separate proxy auth error hostname into separate header - 849219 - don't explain the error about not subscribing proxy channels diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 31e1bb0..e525103 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.61-1 backend/ +1.8.62-1 backend/ commit b8ae9401d610430cc231400c575dd7b44b2723bd Author: Aron Parsons <aronparsons(a)gmail.com> Date: Sun Aug 26 13:01:09 2012 -0400 add --no-errata option to spacewalk-repo-sync diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py index 6fecd77..0c26f98 100644 --- a/backend/satellite_tools/reposync.py +++ b/backend/satellite_tools/reposync.py @@ -43,11 +43,12 @@ def set_filter_opt(option, opt_str, value, parser): class RepoSync(object): def __init__(self, channel_label, repo_type, url=None, fail=False, - quiet=False, filters=[]): + quiet=False, filters=[], no_errata = False): self.regen = False self.fail = fail self.quiet = quiet self.filters = filters + self.no_errata = no_errata initCFG('server') db_string = CFG.DEFAULT_DB #"rhnsat/rhnsat@rhnsat" @@ -100,7 +101,9 @@ class RepoSync(object): try: plugin = self.repo_plugin(url, self.channel_label) self.import_packages(plugin, repo_id, url) - self.import_updates(plugin, url) + + if not self.no_errata: + self.import_updates(plugin, url) except Exception, e: self.error_msg("ERROR: %s" % e.value) continue diff --git a/backend/satellite_tools/spacewalk-repo-sync b/backend/satellite_tools/spacewalk-repo-sync index 3f6de96..527fe27 100755 --- a/backend/satellite_tools/spacewalk-repo-sync +++ b/backend/satellite_tools/spacewalk-repo-sync @@ -79,6 +79,8 @@ def main(): callback=reposync.set_filter_opt, type='str', nargs=1, dest='filters', default=[], help="List of excluded packages") + parser.add_option('', '--no-errata', action='store_true', dest='no_errata', + default=False, help="Do not sync errata") (options, args) = parser.parse_args() if not options.channel_label: @@ -89,7 +91,8 @@ def main(): url=options.url, fail=options.fail, quiet=options.quiet, - filters=options.filters) + filters=options.filters, + no_errata=options.no_errata) sync.sync() releaseLOCK() return 0 diff --git a/backend/satellite_tools/spacewalk-repo-sync.sgml b/backend/satellite_tools/spacewalk-repo-sync.sgml index 73379cd..c4d562d 100644 --- a/backend/satellite_tools/spacewalk-repo-sync.sgml +++ b/backend/satellite_tools/spacewalk-repo-sync.sgml @@ -53,6 +53,10 @@ Syncs the content from yum repos into Spacewalk or Satellite channels. <arg>-e <replaceable>PKG1,PKG2...</replaceable></arg> <arg>--exclude <replaceable>PKG1,PKG2...</replaceable></arg> </group> + <sbr> + <group> + <arg>--no-errata</arg> + </group> </cmdsynopsis> </synopsis> </refsynopsisdiv> @@ -127,6 +131,12 @@ Syncs the content from yum repos into Spacewalk or Satellite channels. <para>Comma or space separated list of excluded packages.</para> </listitem> </varlistentry> + <varlistentry> + <term>--no-errata</term> + <listitem> + <para>Do not sync errata</para> + </listitem> + </varlistentry> </variablelist> </refsect1>

1 0

Changes to 'refs/tags/spacewalk-java-1.8.134-1'
by StephenHerr 24 Aug '12

24 Aug '12

Tag 'spacewalk-java-1.8.134-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-08-24 20:26 +0000 Tagging package [spacewalk-java] version [1.8.134-1] in directory [java/]. Changes since rhnpush-5.5.53-1: Stephen Herr (2): 818700 - allow user to set the gateway for static bonds Automatic commit of package [spacewalk-java] release [1.8.134-1]. --- java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java | 69 ++++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 14 ++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 40 ++++- java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 18 ++ java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 6 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/post-network-options.jspf | 29 +++- java/code/webapp/WEB-INF/struts-config.xml | 2 java/spacewalk-java.spec | 5 rel-eng/packages/spacewalk-java | 2 11 files changed, 151 insertions(+), 38 deletions(-) ---

1 0

2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr 24 Aug '12

24 Aug '12

java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java | 69 ++++++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 14 ++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 40 ++++- java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 18 ++ java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 6 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf | 2 java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/post-network-options.jspf | 29 +++- java/code/webapp/WEB-INF/struts-config.xml | 2 java/spacewalk-java.spec | 5 rel-eng/packages/spacewalk-java | 2 11 files changed, 151 insertions(+), 38 deletions(-) New commits: commit c4f9a7ff56fdf5b7b8f9a28471e7e67030e70f4a Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Aug 24 16:26:02 2012 -0400 Automatic commit of package [spacewalk-java] release [1.8.134-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 7d958fc..74eea99 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -23,7 +23,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.133 +Version: 1.8.134 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -614,6 +614,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Aug 24 2012 Stephen Herr <sherr(a)redhat.com> 1.8.134-1 +- 818700 - allow user to set the gateway for static bonds + * Thu Aug 23 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.133-1 - 851040 - checkstyle issue diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 14eba7c..b805bf3 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.133-1 java/ +1.8.134-1 java/ commit 9bcb26dd83e7957f906d1348a3820fb91050b932 Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Aug 24 16:25:53 2012 -0400 818700 - allow user to set the gateway for static bonds diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java index 77ae4ae..f21addc 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/ScheduleKickstartWizardAction.java @@ -115,6 +115,8 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { public static final String HIDDEN_BOND_SLAVE_INTERFACES = "hiddenBondSlaveInterfaces"; public static final String BOND_STATIC = "bondStatic"; public static final String BOND_IP_ADDRESS = "bondAddress"; + public static final String BOND_NETMASK = "bondNetmask"; + public static final String BOND_GATEWAY = "bondGateway"; public static final String BOND_OPTIONS = "bondOptions"; public static final String CREATE_BOND_VALUE = "bonding"; public static final String STATIC_BOND_VALUE = "true"; @@ -154,6 +156,7 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { /** * {@inheritDoc} */ + @Override public List getResult(RequestContext ctx) { Long sid = ctx.getParamAsLong(RequestContext.SID); User user = ctx.getCurrentUser(); @@ -247,6 +250,10 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { if (StringUtils.isBlank(form.getString(BOND_IP_ADDRESS))) { form.set(BOND_IP_ADDRESS, oldBond.getIpaddr()); } + + if (StringUtils.isBlank(form.getString(BOND_NETMASK))) { + form.set(BOND_NETMASK, oldBond.getNetmask()); + } } String[] slaves = (String[]) form.get(BOND_SLAVE_INTERFACES); @@ -571,17 +578,8 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { if (STATIC_BOND_VALUE.equals(form.getString(BOND_STATIC))) { cmd.setBondDhcp(false); cmd.setBondAddress(form.getString(BOND_IP_ADDRESS)); - List<NetworkInterface> nics = getPublicNetworkInterfaces(cmd - .getServer()); - String netmask = "255.255.255.0"; - for (NetworkInterface nic : nics) { - if (nic.isPublic() && nic.getNetmask() != null && - !StringUtils.isEmpty(nic.getNetmask())) { - netmask = nic.getNetmask(); - break; - } - } - cmd.setBondNetmask(netmask); + cmd.setBondNetmask(form.getString(BOND_NETMASK)); + cmd.setBondGateway(form.getString(BOND_GATEWAY)); } else { cmd.setBondDhcp(true); @@ -758,33 +756,62 @@ public class ScheduleKickstartWizardAction extends RhnWizardAction { } String[] slaves = (String[]) form.get(BOND_SLAVE_INTERFACES); + ActionErrors errors = new ActionErrors(); // if we are trying to create a bond but have not specified a name or at // least one slave interface if (form.getString(BOND_TYPE).equals(CREATE_BOND_VALUE) && (StringUtils.isBlank(form.getString(BOND_INTERFACE)) || slaves.length < 1 || StringUtils.isBlank(slaves[0]))) { - ActionErrors errors = new ActionErrors(); errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage( "kickstart.bond.not.defined.jsp")); - addErrors(ctx.getRequest(), errors); - return false; } - final String ipaddressPattern = "^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + + final String ipv4addressPattern = "^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])$"; - if (form.getString(BOND_STATIC).equals(STATIC_BOND_VALUE) && - !form.getString(BOND_IP_ADDRESS).matches(ipaddressPattern)) { - ActionErrors errors = new ActionErrors(); - errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage( - "kickstart.bond.bad.ip.address.jsp")); + /* + * The IPv6 address regex was created by Stephen Ryan at Dartware + * and taken from this forum: http://forums.intermapper.com/viewtopic.php?t=452 + * It is licenced under a Creative Commons Attribution-ShareAlike 3.0 Unported + * License. We can freely use it in (even in commercial products) as long as + * we attribute its creation to him, so don't remove this message. + */ + final String ipv6addressPattern = "^(((?=(?>.*?::)(?!.*::)))(::)?([0-9A-" + + "F]{1,4}::?){0,5}|([0-9A-F]{1,4}:){6})(\\2([0-9A-F]{1,4}(::?|$))" + + "{0,2}|((25[0-5]|(2[0-4]|1\\d|[1-9])?\\d)(\\.|$)){4}|[0-9A-F]{1," + + "4}:[0-9A-F]{1,4})(?<![^:]:|\\.)\\z"; + + if (form.getString(BOND_STATIC).equals(STATIC_BOND_VALUE)) { + String address = form.getString(BOND_IP_ADDRESS); + String netmask = form.getString(BOND_NETMASK); + String gateway = form.getString(BOND_GATEWAY); + + if (!address.matches(ipv4addressPattern) && + !address.matches(ipv6addressPattern)) { + errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage( + "kickstart.bond.bad.ip.address.jsp")); + } + + if (!netmask.matches(ipv4addressPattern) && + !netmask.matches(ipv6addressPattern)) { + errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage( + "kickstart.bond.bad.netmask.jsp")); + } + + if (!gateway.matches(ipv4addressPattern) && + !gateway.matches(ipv6addressPattern)) { + errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage( + "kickstart.bond.bad.ip.address.jsp")); + } + } + + if (errors.size() > 0) { addErrors(ctx.getRequest(), errors); return false; } - return true; } diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index 6e6b3a0..746d2ae 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -6374,6 +6374,20 @@ Follow this url to see the full list of inactive systems: </context-group> </trans-unit> + <trans-unit id="kickstart.bond.bad.netmask.jsp"> + <source>The netmask specified for the bonded network interface is not valid.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context> + </context-group> + </trans-unit> + + <trans-unit id="kickstart.bond.bad.gateway.jsp"> + <source>The gateway specified for the bonded network interface is not valid.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/details/kickstart/ScheduleWizard.do</context> + </context-group> + </trans-unit> +  <group> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index bd98576..af1636e 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -9802,42 +9802,70 @@ Please note that some manual configuration of these scripts may still be require </trans-unit> <trans-unit id="kickstart.postnetconn.bondname.jsp.label"> - <source>Bond name</source> + <source>Name</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> </context-group> </trans-unit> <trans-unit id="kickstart.postnetconn.bondinterfaces.jsp.label"> - <source>Interfaces to bond</source> + <source>Interfaces</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> </context-group> </trans-unit> <trans-unit id="kickstart.postnetconn.bondoptions.jsp.label"> - <source>Bond options</source> + <source>Options</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> </context-group> </trans-unit> <trans-unit id="kickstart.postnetconn.bondoptionstip.jsp.label"> - <source>Bond options are a space-separated list of any valid "bonding" kernel module options. Common options include mode=[0,1,2] (0 is round-robin, 1 is active-backup, 2 is balance-xor) and miimon=100</source> + <source>Options is a space-separated list of any valid "bonding" kernel module options. Common options include mode=[0,1,2] (0 is round-robin, 1 is active-backup, 2 is balance-xor) and miimon=100</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> </context-group> </trans-unit> <trans-unit id="kickstart.postnetconn.bondstatic.jsp.label"> - <source>Use static networking with this IP address:</source> + <source>Use static networking</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> + </context-group> + </trans-unit> + + <trans-unit id="kickstart.postnetconn.bondaddress.jsp.label"> + <source>IP address:</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> + </context-group> + </trans-unit> + + <trans-unit id="kickstart.postnetconn.bondnetmask.jsp.label"> + <source>Netmask:</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> + </context-group> + </trans-unit> + + <trans-unit id="kickstart.postnetconn.bondgateway.jsp.label"> + <source>Gateway:</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> </context-group> </trans-unit> <trans-unit id="kickstart.postnetconn.bonddhcp.jsp.label"> - <source>Use DHCP to acquire an IP address</source> + <source>Use DHCP</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> + </context-group> + </trans-unit> + + <trans-unit id="kickstart.postnetconn.bonddescription.jsp.label"> + <source>Configure the bond:</source> <context-group name="ctx"> <context context-type="sourcefile">/rhn/kickstart/KickstartSystemDetailsEdit</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java index d18b8bd..5ce4aec 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java @@ -164,6 +164,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { private boolean isBondDhcp; private String bondAddress; private String bondNetmask; + private String bondGateway; /** * Constructor for a kickstart where the host and the target are the same system. @@ -524,6 +525,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { /** * {@inheritDoc} */ + @Override public ValidatorError store() { ValidatorError e = this.doValidation(); @@ -612,7 +614,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation { cmd.setNetworkInfo(isDhcp, networkInterface, this.useIpv6Gateway(), ksdata.getInstallType().getLabel()); cmd.setBridgeInfo(createBond, bondInterface, bondSlaveInterfaces, - bondOptions, isBondDhcp, bondAddress, bondNetmask); + bondOptions, isBondDhcp, bondAddress, bondNetmask, bondGateway); ValidatorError cobblerError = cmd.store(); if (cobblerError != null) { return cobblerError; @@ -1446,6 +1448,20 @@ public class KickstartScheduleCommand extends BaseSystemOperation { } /** + * @return The bondGateway + */ + public String getBondGateway() { + return bondGateway; + } + + /** + * @param bondGatewayIn The bondGateway to set + */ + public void setBondGateway(String bondGatewayIn) { + this.bondGateway = bondGatewayIn; + } + + /** * @return Returns the user. */ @Override diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java index 3743701..b5402d4 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java @@ -70,6 +70,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand { private String bridgeOptions; private String bridgeAddress; private String bridgeNetmask; + private String bridgeGateway; private boolean isBridgeDhcp; /** * @param dhcp true if the network type is dhcp @@ -93,10 +94,11 @@ public class CobblerSystemCreateCommand extends CobblerCommand { * @param isBridgeDhcpIn boolean, if the bridge will use dhcp to obtain an ip address * @param address string, ip address for the bridge (if isDhcp is false) * @param netmask string, netmask for the bridge (if isDhcp is false) + * @param gateway string, gateway for the bridge (if isDhcp is false) */ public void setBridgeInfo(boolean doBridge, String name, List<String> slaves, String options, boolean isBridgeDhcpIn, - String address, String netmask) { + String address, String netmask, String gateway) { setupBridge = doBridge; bridgeName = name; bridgeSlaves = slaves; @@ -104,6 +106,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand { isBridgeDhcp = isBridgeDhcpIn; bridgeAddress = address; bridgeNetmask = netmask; + bridgeGateway = gateway; } /** @@ -418,6 +421,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand { if (!isBridgeDhcp) { net.setNetmask(bridgeNetmask); net.setIpAddress(bridgeAddress); + rec.setGateway(bridgeGateway); } nics.add(net); } diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf index 88b5b6b..607c6da 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/advanced.jspf @@ -41,6 +41,8 @@ function enableBondStaticIpAddress() { var staticBond = document.getElementById("kickstartScheduleWizardForm").bondStatic if (getCheckedValue(staticBond) == 'true') { document.getElementById("bondAddress").disabled = false + document.getElementById("bondNetmask").disabled = false + document.getElementById("bondGateway").disabled = false } } </script> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf index 3759da4..774094e 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf @@ -20,6 +20,8 @@ <input type="hidden" name="hiddenBondSlaveInterfaces" value="${rhn:arrayToString(form.bondSlaveInterfaces)}" /> <input type="hidden" name="bondStatic" value="${form.bondStatic}" /> <input type="hidden" name="bondAddress" value="${form.bondAddress}" /> + <input type="hidden" name="bondNetmask" value="${form.bondNetmask}" /> + <input type="hidden" name="bondGateway" value="${form.bondGateway}" />  <input type="hidden" name="wizardStep" value="first" id="wizard-step" /> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/post-network-options.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/post-network-options.jspf index 292eb71..31fa546 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/post-network-options.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/post-network-options.jspf @@ -7,7 +7,7 @@ <td> <input type="radio" name="bondType" value="none" onclick="form.masterInterfaceName.disabled = true; form.slaveInterfaceNames.disabled = true; form.bondingInterfaceOptions.disabled = true; - form.bondStaticTrue.disabled = true; form.bondStaticFalse.disabled = true; form.bondAddress.disabled = true;" + form.bondStaticTrue.disabled = true; form.bondStaticFalse.disabled = true; form.bondAddress.disabled = true; form.bondNetmask.disabled = true; form.bondGateway.disabled = true;" <c:if test="${form.bondType == null || form.bondType == 'none'}">checked="checked"</c:if> /> <bean:message key="kickstart.postnetconn.none.jsp.label"/>  @@ -20,25 +20,40 @@ <bean:message key="kickstart.postnetconn.bonding.jsp.label" />  <br />      <input type="radio" name="bondStatic" id="bondStaticTrue" value="true" - onclick="form.bondAddress.disabled = false;" + onclick="form.bondAddress.disabled = false; form.bondNetmask.disabled = false; form.bondGateway.disabled = false;" <c:if test="${form.bondStatic == null || form.bondStatic != 'false'}">checked="checked"</c:if> <c:if test="${form.bondType ne 'bonding'}">disabled="true"</c:if>/> - <bean:message key="kickstart.postnetconn.bondstatic.jsp.label" />  - <input type="test" name="bondAddress" id="bondAddress" size="15" Maxlength="15" + <bean:message key="kickstart.postnetconn.bondstatic.jsp.label" /> + <br /> +           <bean:message key="kickstart.postnetconn.bondaddress.jsp.label" />  + <input type="test" name="bondAddress" id="bondAddress" size="15" Maxlength="39" <c:if test="${form.bondType ne 'bonding' && form.bondStatic ne 'true'}">disabled="true"</c:if> value="${form.bondAddress}"/> <br /> +           <bean:message key="kickstart.postnetconn.bondnetmask.jsp.label" />  + <input type="test" name="bondNetmask" id="bondNetmask" size="15" Maxlength="39" + <c:if test="${form.bondType ne 'bonding' && form.bondStatic ne 'true'}">disabled="true"</c:if> + value="${form.bondNetmask}"/> + <br /> +           <bean:message key="kickstart.postnetconn.bondgateway.jsp.label" />  + <input type="test" name="bondGateway" id="bondGateway" size="15" Maxlength="39" + <c:if test="${form.bondType ne 'bonding' && form.bondStatic ne 'true'}">disabled="true"</c:if> + value="${form.bondGateway}"/> + <br />      <input type="radio" name="bondStatic" id="bondStaticFalse" value="false" - onclick="form.bondAddress.disabled = true;" + onclick="form.bondAddress.disabled = true; form.bondNetmask.disabled = true; form.bondGateway.disabled = true;" <c:if test="${form.bondStatic == 'false'}">checked="checked"</c:if> <c:if test="${form.bondType ne 'bonding'}">disabled="true"</c:if>/> <bean:message key="kickstart.postnetconn.bonddhcp.jsp.label" />  <br /> + <br /> +      <bean:message key="kickstart.postnetconn.bonddescription.jsp.label" /> + <br />      <bean:message key="kickstart.postnetconn.bondname.jsp.label" />:  <input type="text" name="bondInterface" id="masterInterfaceName" size="5" Maxlength="10" <c:if test="${form.bondType ne 'bonding'}">disabled="true"</c:if> value="${form.bondInterface}"/> -  <bean:message key="kickstart.postnetconn.bondinterfaces.jsp.label" />:  +      <bean:message key="kickstart.postnetconn.bondinterfaces.jsp.label" />:  <select name="bondSlaveInterfaces" id="slaveInterfaceNames" multiple="multiple" <c:if test="${form.bondType ne 'bonding'}">disabled="true"</c:if> > @@ -48,7 +63,7 @@ value='${nic.name}'>${nic.name}</option> </c:forEach> </select> -  <bean:message key="kickstart.postnetconn.bondoptions.jsp.label" />:  +      <bean:message key="kickstart.postnetconn.bondoptions.jsp.label" />:  <input type="text" name="bondOptions" id="bondingInterfaceOptions" size="10" Maxlength="125" <c:if test="${form.bondType ne 'bonding'}">disabled="true"</c:if> value="${form.bondOptions}"/> diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml index 8cd1a2e..4cef9f2 100644 --- a/java/code/webapp/WEB-INF/struts-config.xml +++ b/java/code/webapp/WEB-INF/struts-config.xml @@ -829,6 +829,8 @@ <form-property name="hiddenBondSlaveInterfaces" type="java.lang.String" /> <form-property name="bondStatic" type="java.lang.String" /> <form-property name="bondAddress" type="java.lang.String" /> + <form-property name="bondNetmask" type="java.lang.String" /> + <form-property name="bondGateway" type="java.lang.String" /> <form-property name="bondOptions" type="java.lang.String" /> <form-property name="networkType" type="java.lang.String" /> <form-property name="networkInterface" type="java.lang.String" />

1 0

Changes to 'refs/tags/rhnpush-5.5.53-1'
by Michael Mraka 24 Aug '12

24 Aug '12

Tag 'rhnpush-5.5.53-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-08-24 18:43 +0000 Tagging package [rhnpush] version [5.5.53-1] in directory [client/tools/rhnpush/]. Changes since rhnpush-5.5.52-1: Michael Mraka (2): latest spacewalk-pylint is required Automatic commit of package [rhnpush] release [5.5.53-1]. --- client/tools/rhnpush/rhnpush.spec | 7 +++++-- rel-eng/packages/rhnpush | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

2 commits - client/tools rel-eng/packages
by Michael Mraka 24 Aug '12

24 Aug '12

client/tools/rhnpush/rhnpush.spec | 7 +++++-- rel-eng/packages/rhnpush | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 82a17d002f465aa8052ccaabed3dd797efe4a020 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Aug 24 20:43:10 2012 +0200 Automatic commit of package [rhnpush] release [5.5.53-1]. diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec index 981d760..1e54c6c 100644 --- a/client/tools/rhnpush/rhnpush.spec +++ b/client/tools/rhnpush/rhnpush.spec @@ -4,7 +4,7 @@ Name: rhnpush Group: Applications/System License: GPLv2 URL: http://fedorahosted.org/spacewalk -Version: 5.5.52 +Version: 5.5.53 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -75,6 +75,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot} %doc COPYING %changelog +* Fri Aug 24 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.5.53-1 +- latest spacewalk-pylint is required + * Fri Aug 24 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.5.52-1 - turned on pylint checks - fixed pylint errors/warnings diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush index 55152cb..d42c4a4 100644 --- a/rel-eng/packages/rhnpush +++ b/rel-eng/packages/rhnpush @@ -1 +1 @@ -5.5.52-1 client/tools/rhnpush/ +5.5.53-1 client/tools/rhnpush/ commit bc6609d2d2478fee9fd4f0bb7925d20ded476ac6 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Aug 24 20:42:10 2012 +0200 latest spacewalk-pylint is required diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec index dbc9b92..981d760 100644 --- a/client/tools/rhnpush/rhnpush.spec +++ b/client/tools/rhnpush/rhnpush.spec @@ -21,7 +21,7 @@ BuildRequires: docbook-utils, gettext BuildRequires: python-devel %if 0%{?fedora} > 15 || 0%{?rhel} > 5 # pylint check -BuildRequires: spacewalk-pylint +BuildRequires: spacewalk-pylint >= 0.6 BuildRequires: rhn-client-tools BuildRequires: spacewalk-backend-libs > 1.8.33 %endif

1 0

Changes to 'refs/tags/rhnpush-5.5.52-1'
by Michael Mraka 24 Aug '12

24 Aug '12

Tag 'rhnpush-5.5.52-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-08-24 16:33 +0000 Tagging package [rhnpush] version [5.5.52-1] in directory [client/tools/rhnpush/]. Changes since spacewalk-pylint-0.7-1: Michael Mraka (44): fixed ConfManager._zero_to_none: Method could be a function disabled error ConfManager.get_config: Instance of 'list' has no 'split' member fixed Line too long (146/120) fixed TestObj1._private_function: Method could be a function TestObj1.public_function: Method could be a function TestObj2._private_function: Method could be a function TestObj2.public_function: Method could be a function fixed UtilsTestCase.testAttrNotFunction: Module 'utils' has no 'attr_not_function' member disabled warning UtilsTestCase.testMakeCommonAttrEqual: Access to a protected member _d of a client class disabled warning ArchiveTest.testInstantiation: Method could be a function ArchiveTest.testFind: Method could be a function ArchiveTest.testFindPath: Method could be a function ArchiveTest.testRead: Method could be a function disable warning Access to a protected member _read_conf ig_files of a client class Instance of 'rhnpushConfigParser' has no 'usage' member Instance of 'rhnpushConfigParser' has no 'usage' member RhnConfigTestCase: Too many public methods (22/20) disabled warning class1: Too few public methods (0/1) fixed PackageUpload.encode_values: Method could be a function fixed Line too long (136/120) reused checksum.getFileChecksum() fixed Unused variable 'x' Unused variable 'pspe' Unused variable 'sect_dict' fixed Operator not preceded by a space fixed More than one statement on a single line fixed _to_db_timestamp: Using possibly undefined loop variable 'i' disabled warning Access to a protected member _archive_dir of a client class disabled warning create_patch_mpm: Too many statements (54/50) disabled warning _run: Catch "Exception" disabled warning Line too long (123/120) disabled error Instance of 'rhnpushConfigParser' has no 'usage' member Instance of 'rhnpushConfigParser' has no 'list' member Instance of 'UploadClass' has no 'die' member Instance of 'UploadClass' has no 'list' member Instance of 'rhnpushConfigParser' has no 'dir' member Instance of 'rhnpushConfigParser' has no 'stdin' member Instance of 'UploadClass' has no 'directory' member Instance of 'rhnpushConfigParser' has no 'stdin' member Instance of 'rhnpushConfigParser' has no 'dir' member Instance of 'UploadClass' has no 'readStdin' member Instance of 'rhnpushConfigParser' has no 'dir' member Instance of 'rhnpushConfigParser' has no 'stdin' member Instance of 'UploadClass' has no 'readStdin' member Instance of 'UploadClass' has no 'directory' member Instance of 'UploadClass' has no 'filter_excludes' member Instance of 'rhnpushConfigParser' has no 'newest' member Instance of 'UploadClass' has no 'die' member Instance of 'UploadClass' has no 'newest' member Instance of 'Uplo adClass' has no 'newest' member Ins fixed UploadClass.package: Invalid name "FileChecksumType" (should match [a-z_][a-zA-Z0-9_]{,30}$) fixed Class has no __init__ method Attribute 'url_v2' defined outside __init__ Attribute 'ping_status' defined outside __init__ fixed Unused import getFileChecksum fixed UploadClass.setCount: Attribute 'count' defined outside __init__ UploadClass.setServer: Attribute 'server' defined outside __init__ UploadClass.writeSession: Attribute 'session' defined outside __init__ UploadClass.setOrg: Attribute 'orgId' defined outside __init__ fixed Unused import struct, re fixed UploadClass.packages: Unused variable 'a' UploadClass.packages: Unused variable 't' UploadClass.check_package_exists: Unused variable 'e' disabled warning No exception type(s) specified disabled false warnings UploadClass.packages: Attribute 'files' defined outside __init__ UploadClass.setChannels: Attribute 'channels' defined outside __init__ UploadClass.setForce: Attribute 'force' defined outside __init__ UploadClass.setURL: Attribute 'url' defined outside __init__ UploadClass.setOrg: Attribute 'orgId' defined outside __init__ UploadClass.setRelativeDir: Attribute 'relativeDir' defined outside __init__ fixed UploadClass.die: Method could be a function UploadClass._processFile: Method could be a function fixed Unused variable 'pkg_channel' Unused variable 'e' disabled warning UploadClass.readSession: Catch "Exception" fixed UploadClass.setRelativeDir: Attribute 'relativeDir' defined outside __init__ disabled listMissingSourcePackagesBySession: Invalid name "listMissingSourcePackagesBySession" (should match [a-z_][a-zA-Z0-9_]{,30}$) getSourcePackageChecksumBySession: Invalid name "getSourcePackageChecksumBySession" (should match [a-z_][a-zA-Z0-9_]{,30}$) exists_getPackageChecksumBySession: Invalid name "exists_getPackageChecksumBySession" (should match [a-z_][a-zA-Z0-9_]{,30}$) ReportError: Invalid name "ReportError" (should match [a-z_][a-zA-Z0-9_]{,30}$) fixed get_archive_parser: Invalid name "Class" (should match [a-z_][a-zA-Z0-9_]{,30}$) fixed ZipParser: Method '_explode_cmd' is abstract in class 'ArchiveParser' but is not overridden TarParser: Method '_explode_cmd' is abstract in class 'ArchiveParser' but is not overridden _my_popen() already raises exception if status != 0 fixed Unused variable 'dirs' Unused variable 'wr' fixed ArchiveParser._explode: Unused argument 'archive' disable warning ArchiveParser.direct_read: Catch "Exception" disabled Unable to import 'cgiwrap' turned on pylint checks disabled warnings ConfManager.get_config: Attribute 'files' defined outside __init__ Automatic commit of package [rhnpush] release [5.5.52-1]. Tomas Lestach (1): 849101 - initialize proxyAccept if no http proxy information is in the up2date file --- client/tools/rhnpush/archive.py | 44 +++++++++------- client/tools/rhnpush/rhnpush.py | 50 ++++++++++++------ client/tools/rhnpush/rhnpush.spec | 17 ++++++ client/tools/rhnpush/rhnpush_config.py | 1 client/tools/rhnpush/rhnpush_confmanager.py | 16 +++--- client/tools/rhnpush/rhnpush_v2.py | 3 - client/tools/rhnpush/solaris2mpm.py | 66 ++++++++----------------- client/tools/rhnpush/test/testRhnpushConfig.py | 1 client/tools/rhnpush/test/testUtils.py | 23 +++++--- client/tools/rhnpush/test/test_archive.py | 12 +++- client/tools/rhnpush/uploadLib.py | 20 +++++-- client/tools/rhnpush/utils.py | 1 rel-eng/packages/rhnpush | 2 satellite/install/install.pl | 2 14 files changed, 149 insertions(+), 109 deletions(-) ---

1 0

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits August 2012