From ecf75f1919653618de8df0c0c9bab7ff59de65bb Mon Sep 17 00:00:00 2001
From: Daisuke Fujita <fuzita.daisuke@jp.fujitsu.com>
Date: Wed, 7 Nov 2018 03:46:54 -0800
Subject: [PATCH] Support Ubuntu 16.04 for devstack plugin

Update OS version name in the  README.

Update the openjdk/kafka version.

Control the kafka/zookeeper service by systemd.

Change-Id: If0866b4d816689ee54166a5061a4792fa205ae17
---
 devstack/README.md                 |  4 ++--
 devstack/files/kafka/kafka.service | 12 ++++++++++++
 devstack/plugin.sh                 | 15 ++++++++-------
 devstack/settings                  |  8 +++-----
 4 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 devstack/files/kafka/kafka.service

diff --git a/devstack/README.md b/devstack/README.md
index 7c7ddf9..e7734ef 100644
--- a/devstack/README.md
+++ b/devstack/README.md
@@ -1,6 +1,6 @@
 # Monasca Analytics DevStack Plugin
 
-The Monasca Analytics DevStack plugin currently only works on Ubuntu 14.04 (Trusty).
+The Monasca Analytics DevStack plugin currently only works on Ubuntu 16.04 (Xenial).
 More Linux Distributions will be supported in the future.
 
 Running the Monasca Analytics DevStack plugin requires a machine with 8GB of RAM.
@@ -52,7 +52,7 @@ you can add the following two lines to the local.conf file.
 # 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
+#    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,
diff --git a/devstack/files/kafka/kafka.service b/devstack/files/kafka/kafka.service
new file mode 100644
index 0000000..c03d2af
--- /dev/null
+++ b/devstack/files/kafka/kafka.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Apache Kafka
+Requires=network.target
+After=zookeepepr.service
+
+[Service]
+Type=simple
+ExecStart=/opt/kafka/bin/kafka-server-start.sh /etc/kafka/server.properties
+ExecStop=/opt/kafka/bin/kafka-server-stop.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index b3d8cc5..ef2053e 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -69,8 +69,6 @@ function pre_install_monasca_analytics {
 function unstack_monasca_analytics {
     echo_summary "Unstack Monasca-analytics"
 
-    sudo service monasca-analytics stop || true
-
     delete_monasca_analytics_files
 
     sudo userdel monasca-analytics || true
@@ -129,8 +127,7 @@ function unistall_pkgs {
     sudo sed -i -e '/deb https\:\/\/dl.bintray.com\/sbt\/debian \//d' /etc/apt/sources.list.d/sbt.list
     sudo dpkg -r scala
 
-    sudo apt-get -y purge openjdk-7-jdk
-    sudo apt-get -y purge openjdk-7-jre-headless
+    sudo apt-get -y purge $JDK_PKG
 
     sudo rm -rf ~/.m2
 
@@ -243,7 +240,7 @@ function install_zookeeper {
         sudo mkdir -p /var/log/zookeeper || true
         sudo chmod 755 /var/log/zookeeper
 
-        sudo start zookeeper || sudo restart zookeeper
+        sudo systemctl start zookeeper || sudo systemctl restart zookeeper
     else
         echo_summary "SKIP:Install Monasca Zookeeper"
     fi
@@ -290,7 +287,11 @@ function install_kafka {
             sudo sed -i "s/zookeeper\.connect=127\.0\.0\.1:2181/zookeeper.connect=${SERVICE_HOST}:2181/g" /etc/kafka/server.properties
         fi
 
-        sudo start kafka || sudo restart kafka
+        sudo cp -f "${MONASCA_ANALYTICS_BASE}"/devstack/files/kafka/kafka.service /etc/systemd/system/kafka.service
+        sudo chmod 644 /etc/systemd/system/kafka.service
+
+        sudo systemctl enable kafka
+        sudo systemctl start kafka || sudo systemctl restart kafka
     else
         echo_summary "SKIP:Install Monasca Kafka"
     fi
@@ -328,7 +329,7 @@ function post_config_monasca_analytics {
 
 ###
 function extra_monasca_analytics {
-    sudo service monasca-analytics start
+:
 }
 
 
diff --git a/devstack/settings b/devstack/settings
index f921c1c..4d3034a 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -5,7 +5,7 @@
 # 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
+#    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,
@@ -31,7 +31,7 @@ enable_service monasca-analytics
 # spark vars
 SPARK_DIRECTORIES=("/var/spark" "/var/log/spark" "/var/run/spark/work" "/etc/spark/conf" "/etc/spark/init" )
 
-JDK_PKG="openjdk-7-jre-headless openjdk-7-jdk"
+JDK_PKG="openjdk-8-jre-headless openjdk-8-jdk"
 
 MAVEN="apache-maven-3.3.9"
 MAVEN_TARBAL="$MAVEN-bin.tar.gz"
@@ -49,11 +49,9 @@ SPARK_VERSION=${SPARK_VERSION:-1.6.1}
 SPARK_TARBALL_NAME="spark-${SPARK_VERSION}.tgz"
 SPARK_URL="http://archive.apache.org/dist/spark/spark-$SPARK_VERSION/$SPARK_TARBALL_NAME"
 
-BASE_KAFKA_VERSION=${BASE_KAFKA_VERSION:-0.9.0.0}
+BASE_KAFKA_VERSION=${BASE_KAFKA_VERSION:-1.0.1}
 KAFKA_DIR="/opt/kafka"
 KAFKA_DOWNLOAD="$KAFKA_DIR/download"
 KAFKA_VERSION=${KAFKA_VERSION:-${SCALA_VERSION}-${BASE_KAFKA_VERSION}}
 KAFKA_TARBALL="kafka_$KAFKA_VERSION.tgz"
 KAFKA_URL="http://ftp.riken.jp/net/apache/kafka/$BASE_KAFKA_VERSION/$KAFKA_TARBALL"
-#KAFKA_URL="http://apache.arvixe.com/kafka/$BASE_KAFKA_VERSION/$KAFKA_TARBALL"
-KAFKA_URL="http://ftp.riken.jp/net/apache/kafka/$BASE_KAFKA_VERSION/$KAFKA_TARBALL"