Code Review / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 56ad921)
Fix DMaaP install to support HTTPS 65/44965/1
authorMarco Platania <platania@research.att.com>
Thu, 26 Apr 2018 19:36:32 +0000 (15:36 -0400)
committerMarco Platania <platania@research.att.com>
Thu, 26 Apr 2018 19:36:32 +0000 (15:36 -0400)
Change-Id: Ic5216b2460c25f157607d9d78e74fc505264fd54
Issue-ID: INT-444
Signed-off-by: Marco Platania <platania@research.att.com>
boot/dbcl_serv.sh [deleted file] patch | blob | history
boot/dbcl_vm_init.sh patch | blob | history
boot/mr_install.sh patch | blob | history
heat/ONAP/onap_openstack.env patch | blob | history
heat/ONAP/onap_openstack_template.env patch | blob | history

diff --git a/boot/dbcl_serv.sh b/boot/dbcl_serv.sh
deleted file mode 100644 (file)
index dfb7020..0000000
--- a/boot/dbcl_serv.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-
-#############################################################################
-#
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed 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.
-#
-#############################################################################
-
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start daemon at boot time
-# Description:       Enable service provided by daemon.
-### END INIT INFO
-
-dir="/opt"
-cmd="./dbcl_vm_init.sh"
-user="root"
-
-name=`basename $0`
-pid_file="/var/run/$name.pid"
-stdout_log="/var/log/$name.log"
-stderr_log="/var/log/$name.err"
-
-get_pid() {
-    cat "$pid_file"
-}
-
-is_running() {
-    [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
-}
-
-case "$1" in
-    start)
-    if is_running; then
-        echo "Already started"
-    else
-        echo "Starting $name"
-        cd "$dir"
-        if [ -z "$user" ]; then
-            sudo $cmd >> "$stdout_log" 2>> "$stderr_log" &
-        else
-            sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" &
-        fi
-        echo $! > "$pid_file"
-        if ! is_running; then
-            echo "Unable to start, see $stdout_log and $stderr_log"
-            exit 1
-        fi
-    fi
-    ;;
-    stop)
-    if is_running; then
-        echo -n "Stopping $name.."
-        kill `get_pid`
-        for i in {1..10}
-        do
-            if ! is_running; then
-                break
-            fi
-
-            echo -n "."
-            sleep 1
-        done
-        echo
-
-        if is_running; then
-            echo "Not stopped; may still be shutting down or shutdown may have failed"
-            exit 1
-        else
-            echo "Stopped"
-            if [ -f "$pid_file" ]; then
-                rm "$pid_file"
-            fi
-        fi
-    else
-        echo "Not running"
-    fi
-    ;;
-    restart)
-    $0 stop
-    if is_running; then
-        echo "Unable to stop, will not attempt to start"
-        exit 1
-    fi
-    $0 start
-    ;;
-    status)
-    if is_running; then
-        echo "Running"
-    else
-        echo "Stopped"
-        exit 1
-    fi
-    ;;
-    *)
-    echo "Usage: $0 {start|stop|restart|status}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/boot/dbcl_vm_init.sh b/boot/dbcl_vm_init.sh
index 662837a..7ec5baf 100644 (file)
--- a/boot/dbcl_vm_init.sh
+++ b/boot/dbcl_vm_init.sh
@@ -26,6 +26,8 @@ DMAAPBC_DRPROV_FQDN=drprov.simpledemo.onap.org
 # Insert docker run instructions here
 docker run -i -t -d --name dmaap-buscontroller -p 8080:8080 -p 8443:8443 -v $TMP_CFG:/opt/app/config/conf $NEXUS_DOCKER_REPO/onap/dmaap/buscontroller:$DOCKER_IMAGE_VERSION
 
+sleep 15
+
 DBCL_FQDN=dbc.api.simpledemo.onap.org
 DRPS_FQDN=drprov.simpledemo.onap.org
 MR_FQDN=mr.api.simpledemo.onap.org
diff --git a/boot/mr_install.sh b/boot/mr_install.sh
index 9238cf8..391e674 100644 (file)
--- a/boot/mr_install.sh
+++ b/boot/mr_install.sh
@@ -64,11 +64,7 @@ update-rc.d mr_serv.sh defaults
 
 # b) scripts for bus controller (dbcl)
 curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dbcl_vm_init.sh -o /opt/dbcl_vm_init.sh
-curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dbcl_serv.sh -o /opt/dbcl_serv.sh
 chmod +x /opt/dbcl_vm_init.sh
-chmod +x /opt/dbcl_serv.sh
-mv /opt/dbcl_serv.sh /etc/init.d
-update-rc.d dbcl_serv.sh defaults
 
 # Download and install docker-engine and docker-compose
 echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list
@@ -102,5 +98,5 @@ resolvconf -u
 
 # Clone Gerrit repository and run docker containers
 cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO /opt/startup-vm-message-router/demo
+git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO /opt/startup-vm-message-router
 ./mr_vm_init.sh
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index d60a730..b9f0856 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -215,7 +215,7 @@ parameters:
   #####################
   aai_repo: http://gerrit.onap.org/r/aai/test-config
   appc_repo: http://gerrit.onap.org/r/appc/deployment.git
-  mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git 
+  mr_repo: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git 
   so_repo: http://gerrit.onap.org/r/so/docker-config.git
   policy_repo: http://gerrit.onap.org/r/policy/docker.git
   portal_repo: http://gerrit.onap.org/r/portal.git
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 721fd9d..6304601 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -215,7 +215,7 @@ parameters:
   #####################
   aai_repo: http://gerrit.onap.org/r/aai/test-config
   appc_repo: http://gerrit.onap.org/r/appc/deployment.git
-  mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git 
+  mr_repo: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git 
   so_repo: http://gerrit.onap.org/r/so/docker-config.git
   policy_repo: http://gerrit.onap.org/r/policy/docker.git
   portal_repo: http://gerrit.onap.org/r/portal.git
Demo applications and templates for ONAP platform instantiation.