You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/08/18 13:01:44 UTC
[1/2] incubator-brooklyn git commit: Adding --replacepkgs parameter
to ensure proper epel install
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 76d24ca04 -> 42d9871ec
Adding --replacepkgs parameter to ensure proper epel install
- rpm -Uvh exits with 1 if it is already installed
- replacepkgs ensures that the package will be properly updated
or replaced if already installed
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c38f8ad4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c38f8ad4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c38f8ad4
Branch: refs/heads/master
Commit: c38f8ad4e51ce8792343a67432eca48bcb290192
Parents: 5ef0b61
Author: Yavor Yanchev <ya...@yanchev.com>
Authored: Mon Aug 17 18:42:46 2015 +0300
Committer: Yavor Yanchev <ya...@yanchev.com>
Committed: Mon Aug 17 18:42:46 2015 +0300
----------------------------------------------------------------------
.../java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c38f8ad4/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
index 470221e..9c9ff4a 100644
--- a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
+++ b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
@@ -100,7 +100,7 @@ public class RabbitSshDriver extends AbstractSoftwareProcessSshDriver implements
List<String> commands = ImmutableList.<String>builder()
// EPEL repository for erlang install required on some Centos distributions
- .add(chainGroup("which yum", sudo("yum -y update ca-certificates"), sudo("rpm -Uvh " +
+ .add(chainGroup("which yum", sudo("yum -y update ca-certificates"), sudo("rpm -Uvh --replacepkgs " +
format("http://download.fedoraproject.org/pub/epel/%s/%s/epel-release-%s.noarch.rpm", osMajorVersion, osArchitecture, epelVersion))))
.add(ifExecutableElse0("zypper", chainGroup(
ok(sudo("zypper --non-interactive addrepo http://download.opensuse.org/repositories/devel:/languages:/erlang/SLE_11_SP3 erlang_sles_11")),
[2/2] incubator-brooklyn git commit: This closes #834
Posted by he...@apache.org.
This closes #834
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/42d9871e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/42d9871e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/42d9871e
Branch: refs/heads/master
Commit: 42d9871ec93bfd0612244bad6dfa8f58e0b6b0f1
Parents: 76d24ca c38f8ad
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Aug 18 12:01:21 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Aug 18 12:01:21 2015 +0100
----------------------------------------------------------------------
.../apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/42d9871e/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
----------------------------------------------------------------------
diff --cc software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
index 56e248f,0000000..5186f25
mode 100644,000000..100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java
@@@ -1,208 -1,0 +1,208 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.entity.messaging.rabbit;
+
+import static brooklyn.util.ssh.BashCommands.*;
+import static java.lang.String.format;
+
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
+import brooklyn.entity.basic.Entities;
+import brooklyn.entity.basic.lifecycle.ScriptHelper;
+import org.apache.brooklyn.entity.messaging.amqp.AmqpServer;
+import org.apache.brooklyn.location.basic.SshMachineLocation;
+import brooklyn.util.collections.MutableMap;
+import brooklyn.util.net.Networking;
+import brooklyn.util.os.Os;
+
+/**
+ * TODO javadoc
+ */
+public class RabbitSshDriver extends AbstractSoftwareProcessSshDriver implements RabbitDriver {
+
+ private static final Logger log = LoggerFactory.getLogger(RabbitSshDriver.class);
+
+ // See http://fedoraproject.org/wiki/EPEL/FAQ#howtouse
+ private static final Map<String, String> CENTOS_VERSION_TO_EPEL_VERSION = ImmutableMap.of(
+ "5", "5-4",
+ "6", "6-8",
+ "7", "7-5"
+ );
+
+ public RabbitSshDriver(RabbitBrokerImpl entity, SshMachineLocation machine) {
+ super(entity, machine);
+ }
+
+ protected String getLogFileLocation() { return getRunDir()+"/"+entity.getId()+".log"; }
+
+ public Integer getAmqpPort() { return entity.getAttribute(AmqpServer.AMQP_PORT); }
+
+ public String getVirtualHost() { return entity.getAttribute(AmqpServer.VIRTUAL_HOST_NAME); }
+
+ public String getErlangVersion() { return entity.getConfig(RabbitBroker.ERLANG_VERSION); }
+
+ @Override
+ public RabbitBrokerImpl getEntity() {
+ return (RabbitBrokerImpl) super.getEntity();
+ }
+
+ @Override
+ public void preInstall() {
+ resolver = Entities.newDownloader(this);
+ setExpandedInstallDir(Os.mergePaths(getInstallDir(), resolver.getUnpackedDirectoryName(format("rabbitmq_server-%s", getVersion()))));
+ }
+
+ @Override
+ public void install() {
+ List<String> urls = resolver.getTargets();
+ String saveAs = resolver.getFilename();
+ // Version and architecture are only required for download of epel package on RHEL/Centos systems so pick sensible
+ // defaults if unavailable
+ String osMajorVersion = getMachine().getOsDetails().getVersion();
+ if (Strings.isNullOrEmpty(osMajorVersion)) {
+ osMajorVersion = "7";
+ } else {
+ osMajorVersion = osMajorVersion.indexOf(".") > 0 ? osMajorVersion.substring(0, osMajorVersion.indexOf('.')) : osMajorVersion;
+ if (!CENTOS_VERSION_TO_EPEL_VERSION.keySet().contains(osMajorVersion)) {
+ osMajorVersion = "7";
+ }
+ }
+ String epelVersion = CENTOS_VERSION_TO_EPEL_VERSION.get(osMajorVersion);
+ String osArchitecture = getMachine().getOsDetails().getArch();
+ if (Strings.isNullOrEmpty(osArchitecture)) {
+ osArchitecture = "x86_64";
+ }
+
+ List<String> commands = ImmutableList.<String>builder()
+ // EPEL repository for erlang install required on some Centos distributions
- .add(chainGroup("which yum", sudo("yum -y update ca-certificates"), sudo("rpm -Uvh " +
++ .add(chainGroup("which yum", sudo("yum -y update ca-certificates"), sudo("rpm -Uvh --replacepkgs " +
+ format("http://download.fedoraproject.org/pub/epel/%s/%s/epel-release-%s.noarch.rpm", osMajorVersion, osArchitecture, epelVersion))))
+ .add(ifExecutableElse0("zypper", chainGroup(
+ ok(sudo("zypper --non-interactive addrepo http://download.opensuse.org/repositories/devel:/languages:/erlang/SLE_11_SP3 erlang_sles_11")),
+ ok(sudo("zypper --non-interactive addrepo http://download.opensuse.org/repositories/devel:/languages:/erlang/openSUSE_11.4 erlang_suse_11")),
+ ok(sudo("zypper --non-interactive addrepo http://download.opensuse.org/repositories/devel:/languages:/erlang/openSUSE_12.3 erlang_suse_12")),
+ ok(sudo("zypper --non-interactive addrepo http://download.opensuse.org/repositories/devel:/languages:/erlang/openSUSE_13.1 erlang_suse_13")))))
+ .add(installPackage( // NOTE only 'port' states the version of Erlang used, maybe remove this constraint?
+ ImmutableMap.of(
+ "apt", "erlang-nox erlang-dev",
+ "port", "erlang@"+getErlangVersion()+"+ssl"),
+ "erlang"))
+ .addAll(commandsToDownloadUrlsAs(urls, saveAs))
+ .add(installExecutable("tar"))
+ .add(format("tar xvzf %s",saveAs))
+ .build();
+
+ newScript(INSTALLING).
+ failOnNonZeroResultCode().
+ body.append(commands).execute();
+ }
+
+ @Override
+ public void customize() {
+ Networking.checkPortsValid(MutableMap.of("amqpPort", getAmqpPort()));
+ ScriptHelper scriptHelper = newScript(CUSTOMIZING);
+
+ scriptHelper.body.append(
+ format("cp -R %s/* .", getExpandedInstallDir())
+ );
+
+ if (Boolean.TRUE.equals(entity.getConfig(RabbitBroker.ENABLE_MANAGEMENT_PLUGIN))) {
+ scriptHelper.body.append(
+ "./sbin/rabbitmq-plugins enable rabbitmq_management"
+ );
+ }
+ scriptHelper.failOnNonZeroResultCode();
+ scriptHelper.execute();
+
+ copyTemplate(entity.getConfig(RabbitBroker.CONFIG_TEMPLATE_URL), getConfigPath() + ".config");
+ }
+
+ @Override
+ public void launch() {
+ newScript(MutableMap.of("usePidFile", false), LAUNCHING)
+ .body.append(
+ "nohup ./sbin/rabbitmq-server > console-out.log 2> console-err.log &",
+ "for i in {1..10}\n" +
+ "do\n" +
+ " grep 'broker running' console-out.log && exit\n" +
+ " sleep 1\n" +
+ "done",
+ "echo \"Couldn't determine if rabbitmq-server is running\"",
+ "exit 1"
+ ).execute();
+ }
+
+ @Override
+ public void configure() {
+ newScript(CUSTOMIZING)
+ .body.append(
+ "./sbin/rabbitmqctl add_vhost "+getEntity().getVirtualHost(),
+ "./sbin/rabbitmqctl set_permissions -p "+getEntity().getVirtualHost()+" guest \".*\" \".*\" \".*\""
+ ).execute();
+ }
+
+
+ public String getPidFile() { return "rabbitmq.pid"; }
+
+ @Override
+ public boolean isRunning() {
+ return newScript(MutableMap.of("usePidFile", false), CHECK_RUNNING)
+ .body.append("./sbin/rabbitmqctl -q status")
+ .execute() == 0;
+ }
+
+ @Override
+ public void stop() {
+ newScript(MutableMap.of("usePidFile", false), STOPPING)
+ .body.append("./sbin/rabbitmqctl stop")
+ .execute();
+ }
+
+
+ @Override
+ public void kill() {
+ stop(); // TODO No pid file to easily do `kill -9`
+ }
+
+ @Override
+ public Map<String, String> getShellEnvironment() {
+ return MutableMap.<String, String>builder()
+ .putAll(super.getShellEnvironment())
+ .put("RABBITMQ_HOME", getRunDir())
+ .put("RABBITMQ_LOG_BASE", getRunDir())
+ .put("RABBITMQ_NODENAME", getEntity().getId())
+ .put("RABBITMQ_NODE_PORT", getAmqpPort().toString())
+ .put("RABBITMQ_PID_FILE", getRunDir()+"/"+getPidFile())
+ .put("RABBITMQ_CONFIG_FILE", getConfigPath())
+ .build();
+ }
+
+ private String getConfigPath() {
+ return getRunDir() + "/rabbitmq";
+ }
+}