refactored the install scripts so that they don't have the service name,...

refactored the install scripts so that they don't have the service name, simplies the orchestration in vagrant, openstack and later for the orchestator

Vagrantfile

@@ -87,13 +87,12 @@ Vagrant.configure("2") do |config|
       puts "Instance name #{instance_name}:"
       case instance_name
         when 'clmc-service'
-          instance_config.vm.provision :shell, :path => "scripts/clmc-service/#{host["install_script"]}"
-          instance_config.vm.provision :shell, :path => "scripts/clmc-service/#{host["start_script"]}" 
+          instance_config.vm.provision :shell, :path => "scripts/clmc-service/install.sh"
         else
           # specific service install
-          instance_config.vm.provision :shell, :path => "test/services/#{host["service_name"]}/install-#{host["service_name"]}.sh"     
+          instance_config.vm.provision :shell, :path => "test/services/#{host["service_name"]}/install.sh"     
           # CLMC agent install
-          instance_config.vm.provision :shell, :path => "scripts/clmc-agent/install-clmc-agent.sh", :args => "/vagrant/test/services/#{host["service_name"]}/telegraf_#{host["service_name"]}_template.conf #{host["location"]} #{host["sfc_id"]} #{host["sfc_id_instance"]} #{host["sf_id"]} #{host["sf_id_instance"]} #{host["ipendpoint_id"]} #{host["influxdb_url"]} #{host["database_name"]}"
+          instance_config.vm.provision :shell, :path => "scripts/clmc-agent/install.sh", :args => "/vagrant/test/services/#{host["service_name"]}/telegraf_template.conf #{host["location"]} #{host["sfc_id"]} #{host["sfc_id_instance"]} #{host["sf_id"]} #{host["sf_id_instance"]} #{host["ipendpoint_id"]} #{host["influxdb_url"]} #{host["database_name"]}"
       end
 
       

infra/full/rspec.yml

@@ -11,8 +11,6 @@ hosts:
       - guest: 9092
         host: 9092
     ip_address: "192.168.50.10"
-    install_script: "install-clmc-service.sh"
-    start_script: "start-clmc-service.sh"
   - name: apache1
     cpus: 1
     memory: 2048

infra/streaming-sim/rspec.yml

@@ -11,8 +11,6 @@ hosts:
       - guest: 9092
         host: 9092
     ip_address: "192.168.50.10"
-    install_script: "install-clmc-service.sh"
-    start_script: "start-clmc-service.sh"
   - name: ipendpoint1
     cpus: 1
     memory: 2048

infra/streaming/rspec.yml

@@ -11,8 +11,6 @@ hosts:
       - guest: 9092
         host: 9092
     ip_address: "192.168.50.10"
-    install_script: "install-clmc-service.sh"
-    start_script: "start-clmc-service.sh"
   - name: apache1
     cpus: 1
     memory: 2048

scripts/clmc-service/install-clmc-service.sh → scripts/clmc-service/install.sh

@@ -39,3 +39,7 @@ dpkg -i kapacitor_1.3.1_amd64.deb
 # install Chronograf
 wget https://dl.influxdata.com/chronograf/releases/chronograf_1.3.3.0_amd64.deb
 dpkg -i chronograf_1.3.3.0_amd64.deb
+
+systemctl start influxdb
+systemctl start kapacitor
+systemctl start chronograf

scripts/clmc-service/start-clmc-service.sh

-#!/bin/bash
-#/////////////////////////////////////////////////////////////////////////
-#//
-#// (c) University of Southampton IT Innovation Centre, 2018
-#//
-#// Copyright in this software belongs to University of Southampton
-#// IT Innovation Centre of Gamma House, Enterprise Road,
-#// Chilworth Science Park, Southampton, SO16 7NS, UK.
-#//
-#// This software may not be used, sold, licensed, transferred, copied
-#// or reproduced in whole or in part in any manner or form or in or
-#// on any media by any person other than in accordance with the terms
-#// of the Licence Agreement supplied with the software, or otherwise
-#// without the prior written consent of the copyright owners.
-#//
-#// This software is distributed WITHOUT ANY WARRANTY, without even the
-#// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#// PURPOSE, except where stated in the Licence Agreement supplied with
-#// the software.
-#//
-#//      Created By :            Simon Crowle
-#//      Created Date :          03/11/2018
-#//      Created for Project :   FLAME
-#//
-#/////////////////////////////////////////////////////////////////////////
-
-echo Starting TICK stack services...
-
-systemctl start influxdb
-systemctl start kapacitor
-systemctl start chronograf
\ No newline at end of file