diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2017-09-18 15:11:20 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2017-09-18 15:11:20 +0200 |
commit | 818e52e2c3d614397c152b22fc93b188607c6865 (patch) | |
tree | 88001b6719f9497fad9f6fa92727b1a89ca67bec /node-admin | |
parent | 5c48cdcd304dc826077d418a0a6a030dfaf7a74f (diff) |
Remove unused application files
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/configserver-app/hosted-vespa/http-server.xml | 2 | ||||
-rw-r--r-- | node-admin/configserver-app/node-flavors.xml | 15 | ||||
-rwxr-xr-x | node-admin/configserver-app/start-config-server.sh | 116 | ||||
-rw-r--r-- | node-admin/node-admin-zone-app/services.xml | 20 | ||||
-rw-r--r-- | node-admin/src/main/application/services.xml | 22 |
5 files changed, 0 insertions, 175 deletions
diff --git a/node-admin/configserver-app/hosted-vespa/http-server.xml b/node-admin/configserver-app/hosted-vespa/http-server.xml deleted file mode 100644 index 369a1af810b..00000000000 --- a/node-admin/configserver-app/hosted-vespa/http-server.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<server port="4080" id="configserver-real" /> diff --git a/node-admin/configserver-app/node-flavors.xml b/node-admin/configserver-app/node-flavors.xml deleted file mode 100644 index d1892edddb3..00000000000 --- a/node-admin/configserver-app/node-flavors.xml +++ /dev/null @@ -1,15 +0,0 @@ -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<config name="config.provisioning.flavors"> - <flavor> - <item> - <!-- Note: This flavor does NOT match the production 'docker' flavor --> - <name>docker</name> - <environment>DOCKER_CONTAINER</environment> - <minCpuCores>1.0</minCpuCores> - <minMainMemoryAvailableGb>3.0</minMainMemoryAvailableGb> - <minDiskAvailableGb>10.0</minDiskAvailableGb> - <description>DOCKER_CONTAINER with 1.0 CPUs, 3.0 Gb memory and 10.0 Gb disk</description> - </item> - </flavor> -</config> - diff --git a/node-admin/configserver-app/start-config-server.sh b/node-admin/configserver-app/start-config-server.sh deleted file mode 100755 index f9cf49ed879..00000000000 --- a/node-admin/configserver-app/start-config-server.sh +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/bash -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -# BEGIN environment bootstrap section -# Do not edit between here and END as this section should stay identical in all scripts - -findpath () { - myname=${0} - mypath=${myname%/*} - myname=${myname##*/} - if [ "$mypath" ] && [ -d "$mypath" ]; then - return - fi - mypath=$(pwd) - if [ -f "${mypath}/${myname}" ]; then - return - fi - echo "FATAL: Could not figure out the path where $myname lives from $0" - exit 1 -} - -COMMON_ENV=libexec/vespa/common-env.sh - -source_common_env () { - if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - export VESPA_HOME - common_env=$VESPA_HOME/$COMMON_ENV - if [ -f "$common_env" ]; then - . $common_env - return - fi - fi - return 1 -} - -findroot () { - source_common_env && return - if [ "$VESPA_HOME" ]; then - echo "FATAL: bad VESPA_HOME value '$VESPA_HOME'" - exit 1 - fi - if [ "$ROOT" ] && [ -d "$ROOT" ]; then - VESPA_HOME="$ROOT" - source_common_env && return - fi - findpath - while [ "$mypath" ]; do - VESPA_HOME=${mypath} - source_common_env && return - mypath=${mypath%/*} - done - echo "FATAL: missing VESPA_HOME environment variable" - echo "Could not locate $COMMON_ENV anywhere" - exit 1 -} - -findroot - -# END environment bootstrap section - -export LC_ALL=C - -function VerifyRequiredEnvironmentVariablesAreSet { - if [ -z "$HOSTED_VESPA_REGION" ] - then - Fail "Environment variable HOSTED_VESPA_REGION is not set" - fi - if [ -z "$CONFIG_SERVER_HOSTNAME" ] - then - Fail "Environment variable CONFIG_SERVER_HOSTNAME is not set" - fi - - case "$HOSTED_VESPA_ENVIRONMENT" in - prod|test|dev|staging|perf) : ;; - *) Fail "The HOSTED_VESPA_ENVIRONMENT environment variable must be one of prod, test, dev, staging, or perf" ;; - esac -} - -function InternalMain { - VerifyRequiredEnvironmentVariablesAreSet - - mkdir -p $VESPA_HOME/logs - chmod 1777 $VESPA_HOME/logs - mkdir -p $VESPA_HOME/logs/jdisc_core - - rm -rf $VESPA_HOME/var/vespa/bundlecache/standalone - - yinst set \ - cloudconfig_server.multitenant=true \ - cloudconfig_server.region="$HOSTED_VESPA_REGION" \ - cloudconfig_server.autostart=on \ - cloudconfig_server.default_flavor=docker \ - cloudconfig_server.environment="$HOSTED_VESPA_ENVIRONMENT" \ - cloudconfig_server.hosted_vespa=true \ - services.addr_configserver="$CONFIG_SERVER_HOSTNAME" \ - vespa_zkfacade.restrict="" - - # Can also set jvmargs if necessary: - # set cloudconfig_server.jvmargs=-Dvespa.freezedetector.disable=true -XX:NewRatio=1 -verbose:gc -XX:+PrintGCDateStamps -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Xms6g -Xmx6g - - yinst start cloudconfig_server - - touch $VESPA_HOME/logs/jdisc_core/jdisc_core.log - $VESPA_HOME/bin/vespa-logfmt -N -f $VESPA_HOME/logs/jdisc_core/jdisc_core.log -} - -function Main { - # Prefix each line to stdout/stderr with a timestamp to make it easier to - # understand the progress. - InternalMain |& while read -r - do - printf "%s %s\n" "$(date +%FT%T)" "$REPLY" - done -} - -Main "$@" diff --git a/node-admin/node-admin-zone-app/services.xml b/node-admin/node-admin-zone-app/services.xml deleted file mode 100644 index 1ab9debd225..00000000000 --- a/node-admin/node-admin-zone-app/services.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services version="1.0" application-type="hosted-infrastructure" xmlns:deploy="vespa" xmlns:preprocess="properties"> - - <jdisc id="node-admin" jetty="true" version="1.0"> - <handler id="com.yahoo.vespa.hosted.node.admin.restapi.RestApiHandler" bundle="node-admin"> - <binding>http://*/rest/*</binding> - </handler> - <component id="node-admin" class="com.yahoo.vespa.hosted.node.admin.provider.ComponentsProviderImpl" bundle="node-admin"/> - <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/> - <component id="metrics-wrapper" class="com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper" bundle="docker-api"/> - - <config name='vespa.hosted.dockerapi.docker'> - <isRunningLocally>true</isRunningLocally> - </config> - - <nodes jvmargs="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=localhost:5555 -Dvespa.freezedetector.disable=true" type="host"/> - </jdisc> - -</services> diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml deleted file mode 100644 index a60c11fb935..00000000000 --- a/node-admin/src/main/application/services.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<services version="1.0"> - <jdisc version="1.0" jetty="true"> - <!-- Please update container test when changing this file --> - <handler id="com.yahoo.vespa.hosted.node.admin.restapi.RestApiHandler" bundle="node-admin"> - <binding>http://*/rest/*</binding> - </handler> - <component id="node-admin" class="com.yahoo.vespa.hosted.node.admin.provider.ComponentsProviderImpl" bundle="node-admin"/> - <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/> - <component id="metrics-wrapper" class="com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper" bundle="docker-api"/> - - <config name='vespa.hosted.dockerapi.docker'> - <uri>tcp://localhost:2376</uri> - <isRunningLocally>false</isRunningLocally> - </config> - - <config name='vespa.hosted.node.admin.node-admin'> - <isRunningLocally>false</isRunningLocally> - </config> - </jdisc> -</services> |