From be779fa2d7f44b511bde929582b6340c650d24cc Mon Sep 17 00:00:00 2001 From: gfraboni Date: Tue, 19 Sep 2017 13:25:30 -0400 Subject: Add Consul support to 'OneClick' deployment. The OOM is moving to using Consul to provide health checks for all ONAP components. This push adds deployment of a 3 node Consul Server cluster and a single Consul agent to the 'OneClick' deployment. As a first step, health check scripts for the A&AI microservices have also been included. Support for additional ONAP components will follow. Issue-ID: OOM-86 Change-Id: Ib63f3d8b1b745551c9ec55b6529d022b32006e9c Signed-off-by: gfraboni --- kubernetes/config/docker/init/config-init.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'kubernetes/config/docker/init/config-init.sh') diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh index 9217d2cd68..29167bf844 100755 --- a/kubernetes/config/docker/init/config-init.sh +++ b/kubernetes/config/docker/init/config-init.sh @@ -51,6 +51,9 @@ mkdir -p /config-init/$NAMESPACE/aai/data-router/logs/ mkdir -p /config-init/$NAMESPACE/mso/mariadb/data mkdir -p /config-init/$NAMESPACE/clamp/mariadb/data mkdir -p /config-init/$NAMESPACE/log/elasticsearch/data +mkdir -p /config-init/$NAMESPACE/consul/consul-agent-config/bin +mkdir -p /config-init/$NAMESPACE/consul/consul-agent-config/scripts +mkdir -p /config-init/$NAMESPACE/consul/consul-server-config echo "Setting permissions to container writeable directories" chmod -R 777 /config-init/$NAMESPACE/sdc/logs/ @@ -73,6 +76,7 @@ echo "Substituting configuration parameters" # replace the default 'onap' namespace qualification of K8s hostnames within the config files find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/\.onap-/\.$NAMESPACE-/g" {} \; +find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/kubectl -n onap/kubectl -n $NAMESPACE/g" {} \; # set the ubuntu 14 image find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/UBUNTU_14_IMAGE_NAME_HERE/$OPENSTACK_UBUNTU_14_IMAGE/g" {} \; # set the openstack public network uuid -- cgit 1.2.3-korg