diff options
Diffstat (limited to 'sdc-os-chef')
6 files changed, 4 insertions, 74 deletions
diff --git a/sdc-os-chef/docker-compose.yml b/sdc-os-chef/docker-compose.yml index c91fb9a140..20b97a1391 100644 --- a/sdc-os-chef/docker-compose.yml +++ b/sdc-os-chef/docker-compose.yml @@ -1,39 +1,7 @@ version: "2.1" services: ################################################################ - elasticsearch: - build: . -# context: elasticsearch - container_name: "sdc-es" - restart: "always" - image: "ecomp-nexus:51212/ecomp/sdc-elasticsearch:1610.2.13" - mem_limit: "1g" - memswap_limit: "1g" - logging: - driver: "json-file" - options: - max-size: "100m" - max-file: "10" - ports: - - "9200:9200" - - "9300:9300" - environment: -# - ES_JAVA_OPTS="-Xms1g -Xmx1g" - - ES_HEAP_SIZE=1073741824 - - HOST_IP:HOSTIP - - ENVNAME:DEP_ENV - volumes: - - /etc/localtime:/etc/localtime:ro - - /data/ES:/usr/share/elasticsearch/data - - /data/ASDC/environments:/root/chef-solo/environments - ulimits: - memlock: -1 - nproc: 65535 - nofile: - soft: 100000 - hard: 100000 - cassandra: build: . # context: cassandra @@ -47,7 +15,6 @@ services: max-file: "10" ports: - "9042:9042" - - "9160:9160" environment: - ES_HEAP_SIZE=1073741824 - HOST_IP:HOSTIP @@ -63,38 +30,6 @@ services: soft: 100000 hard: 100000 - - - kibana: - build: . - container_name: "sdc-kbn" - restart: "always" - image: "ecomp-nexus:51212/ecomp/sdc-kibana:1610.2.13" - mem_limit: "1g" - memswap_limit: "1g" - logging: - driver: "json-file" - options: - max-size: "100m" - max-file: "10" - ports: - - "5601:5601" - environment: - - ENVNAME:DEP_ENV - volumes: - - /etc/localtime:/etc/localtime:ro - - /data/ASDC/environments:/root/chef-solo/environments - ulimits: - memlock: -1 - nproc: 65535 - nofile: - soft: 100000 - hard: 100000 - depends_on: - - elasticsearch - - - jettyBE: build: . diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml index 9dad280526..148955815e 100644 --- a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml +++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml @@ -46,7 +46,6 @@ spec: name: sdc-logs ports: - containerPort: 9042 - - containerPort: 9160 readinessProbe: exec: command: diff --git a/sdc-os-chef/kubernetes/sdc/templates/services/all-services.yaml b/sdc-os-chef/kubernetes/sdc/templates/services/all-services.yaml index d568e9c317..8d859d3f6a 100644 --- a/sdc-os-chef/kubernetes/sdc/templates/services/all-services.yaml +++ b/sdc-os-chef/kubernetes/sdc/templates/services/all-services.yaml @@ -29,8 +29,6 @@ spec: ports: - name: sdc-cs-port-9042 port: 9042 - - name: sdc-cs-port-9160 - port: 9160 selector: app: sdc-cs clusterIP: None diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index c5015e681a..759c4699d5 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -21,6 +21,7 @@ LOCAL=false BE_DEBUG_PORT="--publish 4000:4000" FE_DEBUG_PORT="--publish 6000:6000" ONBOARD_DEBUG_PORT="--publish 4001:4001" +CS_PORT=${CS_PORT:-9042} # Java Options: @@ -271,7 +272,7 @@ function sdc-cs { if [ ${LOCAL} = false ]; then docker pull ${PREFIX}/sdc-cassandra:${RELEASE} fi - docker run -dit --name ${DOCKER_NAME} --env RELEASE="${RELEASE}" --env CS_PASSWORD="${CS_PASSWORD}" --env ENVNAME="${DEP_ENV}" --env HOST_IP=${IP} --env MAX_HEAP_SIZE="1536M" --env HEAP_NEWSIZE="512M" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/CS:/var/lib/cassandra --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 9042:9042 --publish 9160:9160 ${PREFIX}/sdc-cassandra:${RELEASE} /bin/sh + docker run -dit --name ${DOCKER_NAME} --env RELEASE="${RELEASE}" --env CS_PASSWORD="${CS_PASSWORD}" --env ENVNAME="${DEP_ENV}" --env HOST_IP=${IP} --env MAX_HEAP_SIZE="1536M" --env HEAP_NEWSIZE="512M" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/CS:/var/lib/cassandra --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish ${CS_PORT}:${CS_PORT} ${PREFIX}/sdc-cassandra:${RELEASE} /bin/sh command_exit_status $? ${DOCKER_NAME} echo "please wait while CS is starting..." monitor_docker ${DOCKER_NAME} @@ -301,7 +302,7 @@ function sdc-cs-onboard-init { if [ ${LOCAL} = false ]; then docker pull ${PREFIX}/sdc-onboard-cassandra-init:${RELEASE} fi - docker run --name ${DOCKER_NAME} --env RELEASE="${RELEASE}" --env CS_HOST_IP=${IP} --env SDC_USER="${SDC_USER}" --env SDC_PASSWORD="${SDC_PASSWORD}" --env CS_PASSWORD="${CS_PASSWORD}" --env ENVNAME="${DEP_ENV}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/CS:/var/lib/cassandra --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --volume ${WORKSPACE}/data/CS-Init:/root/chef-solo/cache ${PREFIX}/sdc-onboard-cassandra-init:${RELEASE} + docker run --name ${DOCKER_NAME} --env RELEASE="${RELEASE}" --env CS_HOST_IP=${IP} --env CS_HOST_PORT=${CS_PORT} --env SDC_USER="${SDC_USER}" --env SDC_PASSWORD="${SDC_PASSWORD}" --env CS_PASSWORD="${CS_PASSWORD}" --env ENVNAME="${DEP_ENV}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/CS:/var/lib/cassandra --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --volume ${WORKSPACE}/data/CS-Init:/root/chef-solo/cache ${PREFIX}/sdc-onboard-cassandra-init:${RELEASE} rc=$? docker_logs ${DOCKER_NAME} if [[ ${rc} != 0 ]]; then exit ${rc}; fi diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile index dade1d343a..15151bfd35 100644 --- a/sdc-os-chef/sdc-cassandra/Dockerfile +++ b/sdc-os-chef/sdc-cassandra/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/base_sdc-cassandra:1.4.1 +FROM onap/base_sdc-cassandra:1.5.0-SNAPSHOT-latest COPY chef-solo /root/chef-solo/ diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/cassandra.yaml.erb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/cassandra.yaml.erb index 8e3d1229ba..3884841122 100644 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/cassandra.yaml.erb +++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/templates/default/cassandra.yaml.erb @@ -449,9 +449,6 @@ rpc_address: <%= @rpc_address %> # rpc_interface: eth1 # rpc_interface_prefer_ipv6: false -# port for Thrift to listen for clients on -rpc_port: 9160 - # RPC address to broadcast to drivers and other Cassandra nodes. This cannot # be set to 0.0.0.0. If left blank, this will be set to the value of # rpc_address. If rpc_address is set to 0.0.0.0, broadcast_rpc_address must |