From: Marco Platania Date: Wed, 23 May 2018 14:35:03 +0000 (-0400) Subject: Remove old DCAE Gen 1 files X-Git-Tag: v1.2.1~37 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=0adab9c1b4160f023272a435f1f4eb97b9ddd318 Remove old DCAE Gen 1 files - Remove install and init scripts Change-Id: Ib25256b345ddf03dfbb8221d0d173874df452ba2 Issue-ID: INT-444 Signed-off-by: Marco Platania --- diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh deleted file mode 100644 index ece7744b..00000000 --- a/boot/dcae_install.sh +++ /dev/null @@ -1,213 +0,0 @@ -#!/bin/bash - -# Read configuration files -ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) -CLOUD_ENV=$(cat /opt/config/cloud_env.txt) -GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) -CODE_REPO=$(cat /opt/config/remote_repo.txt) -MR_REPO=$(cat /opt/config/mr_repo.txt) - -BASE=$(cat /opt/config/dcae_base_environment.txt) -PUBLIC_NET_ID=$(cat /opt/config/public_net_id.txt) -ZONE=$(cat /opt/config/dcae_zone.txt) -STATE=$(cat /opt/config/dcae_state.txt) -HORIZON_URL=$(cat /opt/config/horizon_url.txt) -OPENSTACK_USER=$(cat /opt/config/openstack_user.txt) -OPENSTACK_PASSWORD=$(cat /opt/config/openstack_password.txt) -OPENSTACK_KEYNAME=$(cat /opt/config/key_name.txt)"_"$(cat /opt/config/rand_str.txt)"_dcae" -OPENSTACK_PUBKEY=$(cat /opt/config/pub_key.txt) -OPENSTACK_AUTH_METHOD=$(cat /opt/config/openstack_auth_method.txt) -KEYSTONE_URL=$(cat /opt/config/keystone_url.txt)"/v2.0" -OPENSTACK_TENANT_ID=$(cat /opt/config/tenant_id.txt) -OPENSTACK_TENANT_NAME=OPEN-ECOMP -OPENSTACK_REGION=$(cat /opt/config/openstack_region.txt) -OPENSTACK_PRIVATE_NETWORK=$(cat /opt/config/openstack_private_network_name.txt) - -NEXUS_USER=$(cat /opt/config/nexus_username.txt) -NEXUS_PASSWORD=$(cat /opt/config/nexus_password.txt) -NEXUS_URL_SNAPSHOTS=$(cat /opt/config/nexus_url_snapshots.txt) -DOCKER_REGISTRY=$(cat /opt/config/nexus_docker_repo.txt) -DOCKER_VERSION=$(cat /opt/config/docker_version.txt) -DCAE_CODE_VERSION=$(cat /opt/config/dcae_code_version.txt) - -DCAE_IP_ADDR=$(cat /opt/config/dcae_ip_addr.txt) -DCAE_COLL_IP_ADDR=$(cat /opt/config/dcae_coll_ip_addr.txt) -DCAE_DB_IP_ADDR=$(cat /opt/config/dcae_db_ip_addr.txt) -DCAE_HDP1_IP_ADDR=$(cat /opt/config/dcae_hdp1_ip_addr.txt) -DCAE_HDP2_IP_ADDR=$(cat /opt/config/dcae_hdp2_ip_addr.txt) -DCAE_HDP3_IP_ADDR=$(cat /opt/config/dcae_hdp3_ip_addr.txt) - -MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) - -if [[ $CLOUD_ENV != "rackspace" ]] -then - # Add host name to /etc/host to avoid warnings in openstack images - echo 127.0.0.1 $(hostname) >> /etc/hosts - - # Allow remote login as root - mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk - cp /home/ubuntu/.ssh/authorized_keys /root/.ssh -fi - -# Set private IP in /etc/network/interfaces manually in the presence of public interface -# Some VM images don't add the private interface automatically, we have to do it during the component installation -if [[ $CLOUD_ENV == "openstack_nofloat" ]] -then - CIDR=$(cat /opt/config/oam_network_cidr.txt) - BITMASK=$(echo $CIDR | cut -d"/" -f2) - - # Compute the netmask based on the network cidr - if [[ $BITMASK == "8" ]] - then - NETMASK=255.0.0.0 - elif [[ $BITMASK == "16" ]] - then - NETMASK=255.255.0.0 - elif [[ $BITMASK == "24" ]] - then - NETMASK=255.255.255.0 - fi - - echo "auto eth1" >> /etc/network/interfaces - echo "iface eth1 inet static" >> /etc/network/interfaces - echo " address $DCAE_IP_ADDR" >> /etc/network/interfaces - echo " netmask $NETMASK" >> /etc/network/interfaces - echo " mtu $MTU" >> /etc/network/interfaces - ifup eth1 -fi - -# Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate - -# Download scripts from Nexus -unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae_vm_init.sh > /opt/dcae_vm_init.sh -unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae_serv.sh > /opt/dcae_serv.sh -chmod +x /opt/dcae_vm_init.sh -chmod +x /opt/dcae_serv.sh -mv /opt/dcae_serv.sh /etc/init.d -update-rc.d dcae_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 -apt-get update -apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual -apt-get install -y --allow-unauthenticated docker-engine - -mkdir /opt/docker -curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose -chmod +x /opt/docker/docker-compose - -# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP -DNS_FLAG="" -if [ -s /opt/config/dns_ip_addr.txt ] -then - DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) " -fi -if [ -s /opt/config/external_dns.txt ] -then - DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) " -fi -echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker - -cp /lib/systemd/system/docker.service /etc/systemd/system -sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service -service docker restart - -# DNS IP address configuration -echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head -resolvconf -u - -# Clone Gerrit repository -cd /opt -git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO dcae-startup-vm-controller - -# Build a configuration file for the DCAE Controller. -cd /opt/dcae-startup-vm-controller -mkdir -p /opt/app/dcae-controller -cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG -BASE: $BASE -ZONE: $ZONE -DNS-IP-ADDR: $DNS_IP_ADDR -STATE: $STATE -DCAE-VERSION: $DCAE_CODE_VERSION -HORIZON-URL: $HORIZON_URL/$OPENSTACK_USER -KEYSTONE-URL: $KEYSTONE_URL -OPENSTACK-TENANT-ID: $OPENSTACK_TENANT_ID -OPENSTACK-TENANT-NAME: $OPENSTACK_TENANT_NAME -OPENSTACK-REGION: $OPENSTACK_REGION -OPENSTACK-PRIVATE-NETWORK: $OPENSTACK_PRIVATE_NETWORK -OPENSTACK-USER: $OPENSTACK_USER -OPENSTACK-PASSWORD: $OPENSTACK_PASSWORD -OPENSTACK-AUTH-METHOD: $OPENSTACK_AUTH_METHOD -OPENSTACK-KEYNAME: $OPENSTACK_KEYNAME -OPENSTACK-PUBKEY: $OPENSTACK_PUBKEY - -NEXUS-URL-ROOT: $NEXUS_URL_ROOT -NEXUS-USER: $NEXUS_USER -NEXUS-PASSWORD: $NEXUS_PASSWORD -NEXUS-URL-SNAPSHOTS: $NEXUS_URL_SNAPSHOTS - -DOCKER-REGISTRY: $DOCKER_REGISTRY -DOCKER-VERSION: $DOCKER_VERSION - -GIT-MR-REPO: $MR_REPO - -public_net_id: $PUBLIC_NET_ID -dcae_ip_addr: $DCAE_IP_ADDR -dcae_pstg00_ip_addr: $DCAE_DB_IP_ADDR -dcae_coll00_ip_addr: $DCAE_COLL_IP_ADDR -dcae_cdap00_ip_addr: $DCAE_HDP1_IP_ADDR -dcae_cdap01_ip_addr: $DCAE_HDP2_IP_ADDR -dcae_cdap02_ip_addr: $DCAE_HDP3_IP_ADDR - -EOF_CONFIG - -# For non-Rackspace environment DCAE needs the OS image names and flavors -if [[ $CLOUD_ENV != "rackspace" ]] -then - UBUNTU_1404_IMAGE=$(cat /opt/config/ubuntu_1404_image.txt) - UBUNTU_1604_IMAGE=$(cat /opt/config/ubuntu_1604_image.txt) - FLAVOR_SMALL=$(cat /opt/config/flavor_small.txt) - FLAVOR_MEDIUM=$(cat /opt/config/flavor_medium.txt) - FLAVOR_LARGE=$(cat /opt/config/flavor_large.txt) - FLAVOR_XLARGE=$(cat /opt/config/flavor_xlarge.txt) - -cat >> /opt/app/dcae-controller/config.yaml << EOF_CONFIG -UBUNTU-1404-IMAGE: $UBUNTU_1404_IMAGE -UBUNTU-1604-IMAGE: $UBUNTU_1604_IMAGE -FLAVOR-SMALL: $FLAVOR_SMALL -FLAVOR-MEDIUM: $FLAVOR_MEDIUM -FLAVOR-LARGE: $FLAVOR_LARGE -FLAVOR-XLARGE: $FLAVOR_XLARGE - -EOF_CONFIG -fi - -# Add floating IP section to DCAE config file for OpenStack deployments that use floating IPs -if [[ $CLOUD_ENV == "openstack" ]] -then - # Read floating IP mapping - DCAE_FLOAT_IP_ADDR=$(cat /opt/config/dcae_float_ip.txt) - DCAE_COLL_FLOAT_IP=$(cat /opt/config/dcae_coll_float_ip.txt) - DCAE_DB_FLOAT_IP=$(cat /opt/config/dcae_db_float_ip.txt) - DCAE_HDP1_FLOAT_IP=$(cat /opt/config/dcae_hdp1_float_ip.txt) - DCAE_HDP2_FLOAT_IP=$(cat /opt/config/dcae_hdp2_float_ip.txt) - DCAE_HDP3_FLOAT_IP=$(cat /opt/config/dcae_hdp3_float_ip.txt) - -cat >> /opt/app/dcae-controller/config.yaml << EOF_CONFIG -dcae_float_ip_addr: $DCAE_FLOAT_IP_ADDR -dcae_pstg00_float_ip_addr: $DCAE_DB_FLOAT_IP -dcae_coll00_float_ip_addr: $DCAE_COLL_FLOAT_IP -dcae_cdap00_float_ip_addr: $DCAE_HDP1_FLOAT_IP -dcae_cdap01_float_ip_addr: $DCAE_HDP2_FLOAT_IP -dcae_cdap02_float_ip_addr: $DCAE_HDP3_FLOAT_IP -EOF_CONFIG -fi - -# Run docker containers -cd /opt -./dcae_vm_init.sh diff --git a/boot/dcae_serv.sh b/boot/dcae_serv.sh deleted file mode 100644 index f20a37bf..00000000 --- a/boot/dcae_serv.sh +++ /dev/null @@ -1,116 +0,0 @@ - -############################################################################# -# -# Copyright © 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. -# -############################################################################# - -#!/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="./dcae_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/dcae_vm_init.sh b/boot/dcae_vm_init.sh deleted file mode 100644 index 460c3ef0..00000000 --- a/boot/dcae_vm_init.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) - -cd /opt/dcae-startup-vm-controller -git pull -bash init.sh -make up