Repository: incubator-brooklyn Updated Branches: refs/heads/master b73c05b57 -> 49eabd157
Fix osname check when PostgreSQL is installed on RedHat BYON location - RedHat BYON returns osname as "Red Hat Enterprise Linux", instead of the expected "rhel" Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c826407d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c826407d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c826407d Branch: refs/heads/master Commit: c826407d5ec531c97008228700dbf97708cfa490 Parents: b73c05b Author: Yavor Yanchev <[email protected]> Authored: Fri Oct 9 19:20:11 2015 +0300 Committer: Yavor Yanchev <[email protected]> Committed: Fri Oct 9 19:20:11 2015 +0300 ---------------------------------------------------------------------- .../brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c826407d/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java ---------------------------------------------------------------------- diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java index 475c356..91c3e1e 100644 --- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java +++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlSshDriver.java @@ -191,7 +191,7 @@ public class PostgreSqlSshDriver extends AbstractSoftwareProcessSshDriver implem if (osName.equals("ubuntu")) return "echo skipping yum repo setup as this is not an rpm environment"; - if (osName.equals("rhel")) osName = "redhat"; + if (osName.equals("rhel") || osName.contains("red hat")) osName = "redhat"; else if (osName.equals("centos")) osName = "centos"; else if (osName.equals("sl") || osName.startsWith("scientific")) osName = "sl"; else if (osName.equals("fedora")) osName = "fedora";
