From f43d3498c48a87f7893b8afc57662a64fdca8955 Mon Sep 17 00:00:00 2001
From: Ashwin Agate <ashwin.agate@suse.com>
Date: Fri, 13 Apr 2018 17:21:05 -0700
Subject: [PATCH] Update monasca-transform devstack plugin

* set "publish_region" config value from
  variable "$REGION_NAME"
* set default "publish_kafka_project_id"
  to "mini-mon" instead of "admin"
* update the systemd service unit file
  since that file is created by devstack's
  "run_process" function
  - set KillMode to 'control-group', since
    monasca-tranform generates several
    child process
* remove monasca-transform.service file
  since its now being generated by devstack
  plugin.

Change-Id: I6654b7973f8502d4805d25c96b2038291e398552
Story: 2001815
Task: 14328
---
 .../monasca-transform/monasca-transform.conf  |  1 +
 .../monasca-transform.service                 | 10 ---------
 devstack/plugin.sh                            | 22 ++++++++++++++-----
 3 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100644 devstack/files/monasca-transform/monasca-transform.service

diff --git a/devstack/files/monasca-transform/monasca-transform.conf b/devstack/files/monasca-transform/monasca-transform.conf
index 0584879..8d65b4b 100644
--- a/devstack/files/monasca-transform/monasca-transform.conf
+++ b/devstack/files/monasca-transform/monasca-transform.conf
@@ -16,6 +16,7 @@ password = password
 adapter = monasca_transform.messaging.adapter:KafkaMessageAdapter
 topic = metrics
 brokers=192.168.15.6:9092
+publish_region = useast
 publish_kafka_project_id=d2cb21079930415a9f2a33588b9f2bb6
 adapter_pre_hourly = monasca_transform.messaging.adapter:KafkaMessageAdapterPreHourly
 topic_pre_hourly = metrics_pre_hourly
diff --git a/devstack/files/monasca-transform/monasca-transform.service b/devstack/files/monasca-transform/monasca-transform.service
deleted file mode 100644
index 1799fb5..0000000
--- a/devstack/files/monasca-transform/monasca-transform.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Monasca Transform Daemon
-After=zookeeper.service spark-master.service spark-worker.service
-
-[Service]
-Type=simple
-LimitNOFILE=32768
-ExecStart=/etc/monasca/transform/init/start-monasca-transform.sh
-[Install]
-WantedBy=multi-user.target
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a002718..3d0e18d 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -275,7 +275,6 @@ function install_monasca_transform {
     copy_monasca_transform_files
     create_monasca_transform_venv
 
-    sudo cp -f "${MONASCA_TRANSFORM_FILES}"/monasca-transform/monasca-transform.service /etc/systemd/system/.
     sudo cp -f "${MONASCA_TRANSFORM_FILES}"/monasca-transform/start-monasca-transform.sh /etc/monasca/transform/init/.
     sudo chmod +x /etc/monasca/transform/init/start-monasca-transform.sh
     sudo cp -f "${MONASCA_TRANSFORM_FILES}"/monasca-transform/service_runner.py /etc/monasca/transform/init/.
@@ -303,8 +302,7 @@ function get_id () {
 function ascertain_admin_project_id {
 
     source ~/devstack/openrc admin admin
-    export ADMIN_PROJECT_ID=$(get_id openstack project show admin)
-
+    export ADMIN_PROJECT_ID=$(get_id openstack project show mini-mon)
 }
 
 function copy_monasca_transform_files {
@@ -319,9 +317,12 @@ function copy_monasca_transform_files {
     cp -f "${MONASCA_TRANSFORM_FILES}"/monasca-transform/transform_specs.sql /opt/monasca/transform/lib/.
     cp -f "${MONASCA_TRANSFORM_FILES}"/monasca-transform/pre_transform_specs.sql /opt/monasca/transform/lib/.
     touch /var/log/monasca/transform/monasca-transform.log
-    # set passwords and other variables in configuration files
-    sudo sudo sed -i "s/brokers=192\.168\.15\.6:9092/brokers=${SERVICE_HOST}:9092/g" /etc/monasca-transform.conf
-    sudo sudo sed -i "s/password\s=\spassword/password = ${MONASCA_TRANSFORM_DB_PASSWORD}/g" /etc/monasca-transform.conf
+
+    # set variables in configuration files
+    iniset -sudo /etc/monasca-transform.conf database password "$MONASCA_TRANSFORM_DB_PASSWORD"
+
+    iniset -sudo /etc/monasca-transform.conf messaging brokers "$SERVICE_HOST:9092"
+    iniset -sudo /etc/monasca-transform.conf messaging publish_region "$REGION_NAME"
 }
 
 function create_monasca_transform_venv {
@@ -414,6 +415,15 @@ function extra_monasca_transform {
 
 function start_monasca_transform {
     run_process "monasca-transform" "/etc/monasca/transform/init/start-monasca-transform.sh"
+    # systemd unit file updates
+    local unitfile="$SYSTEMD_DIR/devstack@monasca-transform.service"
+    local after_service="devstack@zookeeper.service devstack@spark-master.service devstack@spark-worker.service"
+    iniset -sudo "$unitfile" "Unit" "After" "$after_service"
+    iniset -sudo "$unitfile" "Service" "Type" "simple"
+    iniset -sudo "$unitfile" "Service" "LimitNOFILE" "32768"
+    # reset  KillMode for monasca-transform, as spawns several child processes
+    iniset -sudo "$unitfile" "Service" "KillMode" "control-group"
+    sudo systemctl daemon-reload
 }
 
 # check for service enabled