From f404a66530eac7b072014af437deb1771977b1f4 Mon Sep 17 00:00:00 2001
From: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Date: Wed, 18 Mar 2020 13:21:35 +0100
Subject: Add certservice client to Makefile (local run)

Move files used only in local run from submodules to base dir

Issue-ID: AAF-1107
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: Ia027bfb5859fb2b316215b3f2633b51666d06280
---
 certServiceClient/client_docker.env  | 14 ---------
 certServiceClient/docker-compose.yml | 59 ------------------------------------
 2 files changed, 73 deletions(-)
 delete mode 100644 certServiceClient/client_docker.env
 delete mode 100644 certServiceClient/docker-compose.yml

(limited to 'certServiceClient')

diff --git a/certServiceClient/client_docker.env b/certServiceClient/client_docker.env
deleted file mode 100644
index f2697173..00000000
--- a/certServiceClient/client_docker.env
+++ /dev/null
@@ -1,14 +0,0 @@
-#Client envs
-REQUEST_URL=http://certservice:8080/v1/certificate/
-REQUEST_TIMEOUT=1000
-OUTPUT_PATH=/var/certs
-CA_NAME=RA
-#Csr config envs
-COMMON_NAME=onap.org
-ORGANIZATION=Linux-Foundation
-ORGANIZATION_UNIT=ONAP
-LOCATION=San-Francisco
-STATE=California
-COUNTRY=US
-SANS=example.org
-
diff --git a/certServiceClient/docker-compose.yml b/certServiceClient/docker-compose.yml
deleted file mode 100644
index b0c65be9..00000000
--- a/certServiceClient/docker-compose.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-version: "2.1"
-
-services:
-  ejbca:
-    image: primekey/ejbca-ce:6.15.2.5
-    hostname: cahostname
-    container_name: aafcert-ejbca
-    ports:
-      - "80:8080"
-      - "443:8443"
-    volumes:
-      - ../certService/src/main/resources/scripts/:/opt/primekey/scripts
-    command: bash -c "
-      ./scripts/ejbca-configuration.sh &
-      /opt/primekey/bin/start.sh
-      "
-    healthcheck:
-      test: ["CMD-SHELL", "curl -kI https://localhost:8443/ejbca/publicweb/healthcheck/ejbcahealth"]
-      interval: 20s
-      timeout: 3s
-      retries: 9
-    networks:
-      - certservice
-
-  certservice:
-    image: onap/org.onap.aaf.certservice.aaf-certservice-api:latest
-    volumes:
-      - ../certService/helm/aaf-cert-service/resources/cmpServers.json:/etc/onap/aaf/certservice/cmpServers.json
-    container_name: aafcert-service
-    ports:
-      - "8080:8080"
-    depends_on:
-      ejbca:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080/actuator/health"]
-      interval: 10s
-      timeout: 3s
-      retries: 9
-    networks:
-      - certservice
-
-  certservice-client:
-    image: onap/org.onap.aaf.certservice.aaf-certservice-client:latest
-    container_name: aafcert-client
-    env_file:
-      - ./client_docker.env
-    user: root #Run as root to avoid volume permission issues
-    volumes:
-      - ./certs_volume/:/var/certs
-    depends_on:
-      certservice:
-        condition: service_healthy
-    networks:
-      - certservice
-
-networks:
-  certservice:
-    driver: bridge
-- 
cgit 1.2.3-korg