aboutsummaryrefslogtreecommitdiffstats
path: root/etc_upload
diff options
context:
space:
mode:
Diffstat (limited to 'etc_upload')
-rw-r--r--etc_upload/restart_upload_config_for_ph_in_docker.sh30
-rw-r--r--etc_upload/upload_config_for_ph_in_docker.sh38
2 files changed, 5 insertions, 63 deletions
diff --git a/etc_upload/restart_upload_config_for_ph_in_docker.sh b/etc_upload/restart_upload_config_for_ph_in_docker.sh
deleted file mode 100644
index 5fd97a9..0000000
--- a/etc_upload/restart_upload_config_for_ph_in_docker.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# org.onap.dcae
-# ================================================================================
-# Copyright (c) 2017 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.
-# ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
-APPNAME=policy_handler
-docker stop ${APPNAME}
-docker rm ${APPNAME}
-docker rmi ${APPNAME}
-docker build -t ${APPNAME} .
-
-RUNSCRIPT=$(dirname $0)/upload_config_for_ph_in_docker.sh
-echo "running script ${RUNSCRIPT}"
-${RUNSCRIPT}
diff --git a/etc_upload/upload_config_for_ph_in_docker.sh b/etc_upload/upload_config_for_ph_in_docker.sh
index e37215e..1eb0364 100644
--- a/etc_upload/upload_config_for_ph_in_docker.sh
+++ b/etc_upload/upload_config_for_ph_in_docker.sh
@@ -31,39 +31,11 @@ if [[ -n ${DOCKER_HOST} ]]; then
DOCKER_HOSTNAME=${DOCKER_HOST//tcp:/}
DOCKER_HOSTNAME=${DOCKER_HOSTNAME//:*[0-9]/}
DOCKER_HOSTNAME=${DOCKER_HOSTNAME//\//}
- echo "${APPNAME} on DOCKER_HOSTNAME=${DOCKER_HOSTNAME}"
- export HOSTNAME=${DOCKER_HOSTNAME}
-
- # replace CONSUL_IP with docker-host-ip if consul-agent is local
- CONSUL_HOST=${HOSTNAME}
- CONSUL_IP=$(host ${CONSUL_HOST} | awk '/has address/ { print $4 ; exit }')
-
- echo "starting ${APPNAME} on HOSTNAME=${HOSTNAME} CONSUL_HOST=${CONSUL_HOST} CONSUL_IP=${CONSUL_IP}"
-
- docker run --name ${APPNAME} -d \
- -e HOSTNAME \
- --add-host consul:${CONSUL_IP} \
- ${APPNAME}
+ CONSUL_HOST=${DOCKER_HOSTNAME}
else
- export HOSTNAME=$(hostname --fqdn)
-
- # replace CONSUL_IP with docker-host-ip if consul-agent is local
- CONSUL_HOST=${HOSTNAME}
- CONSUL_IP=$(host ${CONSUL_HOST} | awk '/has address/ { print $4 ; exit }')
-
- echo "starting ${APPNAME} on HOSTNAME=${HOSTNAME} CONSUL_HOST=${CONSUL_HOST} CONSUL_IP=${CONSUL_IP}"
-
- BASEDIR=$(pwd)
- TARGETDIR=/opt/app/${APPNAME}
+ CONSUL_HOST=devcnsl00.dcae.sic.research.att.com
+fi
- mkdir -p ${BASEDIR}/logs
- mkdir -p ${BASEDIR}/etc_upload/logs
+echo "uploading etc_upload/config.json for ${APPNAME} to CONSUL_HOST=${CONSUL_HOST}"
- docker run --name ${APPNAME} -d \
- -e HOSTNAME \
- --add-host consul:${CONSUL_IP} \
- -v ${BASEDIR}/etc:${TARGETDIR}/etc \
- -v ${BASEDIR}/etc_upload:${TARGETDIR}/etc_upload \
- -v ${BASEDIR}/etc_upload/logs:${TARGETDIR}/logs \
- ${APPNAME}
-fi
+curl -X PUT -H 'Content-Type: application/json' --data-binary "$(cat etc_upload/config.json)" http://${CONSUL_HOST}:8500/v1/kv/${APPNAME} \ No newline at end of file