From 74dafdf8ebbfdf9d4dc40209b86ee5990857ffed Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Wed, 16 Sep 2015 09:51:25 +0000 Subject: [PATCH] dist: add scylla-jmx for AMI Signed-off-by: Takuya ASADA --- dist/ami/build_ami.sh | 5 +++++ dist/ami/files/scylla-setup.sh | 2 ++ dist/ami/scylla.json | 3 +-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dist/ami/build_ami.sh b/dist/ami/build_ami.sh index 882bb560b4..b5730a70ab 100755 --- a/dist/ami/build_ami.sh +++ b/dist/ami/build_ami.sh @@ -21,6 +21,11 @@ if [ ! -f files/scylla-server.rpm ] || [ ! -f files/scylla-server-debuginfo.rpm cd - fi +if [ ! -f files/scylla-jmx.rpm ]; then + echo "copy files/scylla-jmx.rpm before building AMI" + exit 1 +fi + if [ ! -d packer ]; then wget https://dl.bintray.com/mitchellh/packer/packer_0.8.6_linux_amd64.zip mkdir packer diff --git a/dist/ami/files/scylla-setup.sh b/dist/ami/files/scylla-setup.sh index 2b13c9c501..ab9c729f6b 100755 --- a/dist/ami/files/scylla-setup.sh +++ b/dist/ami/files/scylla-setup.sh @@ -20,3 +20,5 @@ chown scylla:scylla /data/* systemctl disable scylla-setup.service systemctl enable scylla-server.service systemctl start scylla-server.service +systemctl enable scylla-jmx.service +systemctl start scylla-jmx.service diff --git a/dist/ami/scylla.json b/dist/ami/scylla.json index f946004f97..7bdbbb07bd 100644 --- a/dist/ami/scylla.json +++ b/dist/ami/scylla.json @@ -25,8 +25,7 @@ "type": "shell", "inline": [ "sudo dnf update -y", - "sudo dnf install -y /home/fedora/scylla-server.rpm", - "sudo dnf install -y /home/fedora/scylla-server-debuginfo.rpm", + "sudo dnf install -y /home/fedora/*.rpm", "sudo dnf install -y mdadm xfsprogs", "sudo cp /home/fedora/coredump.conf /etc/systemd/coredump.conf", "sudo mv /home/fedora/scylla-setup.service /usr/lib/systemd/system",