Repository: brooklyn-server Updated Branches: refs/heads/master e1c310f5f -> 94e09e0e4
Upgrade NSS on yum based systems Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f758dfb9 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f758dfb9 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f758dfb9 Branch: refs/heads/master Commit: f758dfb96e67a183b2aa091e1c3306df1f6fb56f Parents: e1c310f Author: Duncan Godwin <duncan.god...@cloudsoftcorp.com> Authored: Thu Aug 4 15:17:16 2016 +0100 Committer: Duncan Godwin <duncan.god...@cloudsoftcorp.com> Committed: Thu Aug 4 15:17:16 2016 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/util/ssh/BashCommands.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f758dfb9/utils/common/src/main/java/org/apache/brooklyn/util/ssh/BashCommands.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/ssh/BashCommands.java b/utils/common/src/main/java/org/apache/brooklyn/util/ssh/BashCommands.java index 93468d3..69f692e 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/ssh/BashCommands.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/ssh/BashCommands.java @@ -608,14 +608,17 @@ public class BashCommands { */ public static String installJava(int version) { Preconditions.checkArgument(version == 6 || version == 7 || version == 8, "Supported Java versions are 6, 7, or 8"); - return installPackageOr(MutableMap.of("apt", "openjdk-" + version + "-jdk","yum", "java-1." + version + ".0-openjdk-devel"), null, + List<String> commands = new LinkedList<String>(); + commands.add(installPackageOr(MutableMap.of("apt", "openjdk-" + version + "-jdk","yum", "java-1." + version + ".0-openjdk-devel"), null, ifExecutableElse1("zypper", chainGroup( ok(sudo("zypper --non-interactive addrepo http://download.opensuse.org/repositories/Java:/openjdk6:/Factory/SLE_11_SP3 java_sles_11")), ok(sudo("zypper --non-interactive addrepo http://download.opensuse.org/repositories/Java:/openjdk6:/Factory/openSUSE_11.4 java_suse_11")), ok(sudo("zypper --non-interactive addrepo http://download.opensuse.org/repositories/Java:/openjdk6:/Factory/openSUSE_12.3 java_suse_12")), ok(sudo("zypper --non-interactive addrepo http://download.opensuse.org/repositories/Java:/openjdk6:/Factory/openSUSE_13.1 java_suse_13")), alternatives(installPackageOrFail(MutableMap.of("zypper", "java-1_" + version + "_0-openjdk-devel"), null), - installPackageOrFail(MutableMap.of("zypper", "java-1_" + version + "_0-ibm"), null))))); + installPackageOrFail(MutableMap.of("zypper", "java-1_" + version + "_0-ibm"), null)))))); + commands.add(ok(upgradeNSS())); + return chainGroup(commands); } public static String installJava6() { @@ -655,6 +658,16 @@ public class BashCommands { return alternatives(installJava8(), installJava7(), installJava6(), warn("java latest install failed, entity may subsequently fail")); } + /** + * Returns a command which upgrades NSS on Yum based machines - Addresses https://issues.apache.org/jira/browse/BROOKLYN-320 + * @return command + */ + public static String upgradeNSS(){ + return chainGroup( + "which yum", + sudo("yum -y upgrade nss")); + } + /** cats the given text to the given command, using bash << multi-line input syntax */ public static String pipeTextTo(String text, String command) { return "cat << EOL_BROOKLYN | "+command+"\n"
