From f9cc60c28d69f4314c61a0a8fdade66d9c90f2d1 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Thu, 23 Aug 2018 15:40:52 -0400 Subject: Rename asdc-controller docker image OOM would like it to be called onap/so/sdc-controller. Change-Id: Iee12499408fa2bc99bfb2d802c97dd1ec7bcd21e Issue-ID: SO-897 Signed-off-by: Rob Daugherty --- deploy.sh | 4 +- docker-compose.yml | 10 +-- .../config/asdc-controller/onapheat/override.yaml | 78 ---------------------- .../config/sdc-controller/onapheat/override.yaml | 78 ++++++++++++++++++++++ 4 files changed, 85 insertions(+), 85 deletions(-) delete mode 100644 volumes/so/config/asdc-controller/onapheat/override.yaml create mode 100644 volumes/so/config/sdc-controller/onapheat/override.yaml diff --git a/deploy.sh b/deploy.sh index 8e8bb66..4e85ca6 100755 --- a/deploy.sh +++ b/deploy.sh @@ -92,8 +92,8 @@ function pull_docker_images() { $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/bpmn-infra:$MSO_DOCKER_IMAGE_VERSION $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/bpmn-infra:$MSO_DOCKER_IMAGE_VERSION onap/so/bpmn-infra:latest - $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/asdc-controller:$MSO_DOCKER_IMAGE_VERSION - $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/asdc-controller:$MSO_DOCKER_IMAGE_VERSION onap/so/asdc-controller:latest + $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/sdc-controller:$MSO_DOCKER_IMAGE_VERSION + $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/sdc-controller:$MSO_DOCKER_IMAGE_VERSION onap/so/sdc-controller:latest $DOCKER_CMD pull $NEXUS_DOCKER_REPO_MSO/onap/so/vfc-adapter:$MSO_DOCKER_IMAGE_VERSION $DOCKER_CMD tag $NEXUS_DOCKER_REPO_MSO/onap/so/vfc-adapter:$MSO_DOCKER_IMAGE_VERSION onap/so/vfc-adapter:latest diff --git a/docker-compose.yml b/docker-compose.yml index 7e148ae..e17aa2e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -195,15 +195,15 @@ services: - -- - "/app/start-app.sh" ################################################################################ - asdc-controller: - image: onap/so/asdc-controller + sdc-controller: + image: onap/so/sdc-controller ports: - "8085:8085" volumes: - ./volumes/so/ca-certificates/onapheat:/app/ca-certificates - - ./volumes/so/config/asdc-controller/onapheat:/app/config + - ./volumes/so/config/sdc-controller/onapheat:/app/config environment: - - APP=asdc-controller + - APP=sdc-controller - JVM_ARGS=-Xms64m -Xmx512m - DB_HOST=mariadb # - KEYSTORE=msoClientKeyStore-onapheat.jks @@ -211,7 +211,7 @@ services: # - TRUSTSTORE=msoTrustStore.jks # - TRUSTSTORE_PASSWORD=password hostname: - asdc-controller.so.testlab.onap.org + sdc-controller.so.testlab.onap.org depends_on: - mariadb - catalog-db-adapter diff --git a/volumes/so/config/asdc-controller/onapheat/override.yaml b/volumes/so/config/asdc-controller/onapheat/override.yaml deleted file mode 100644 index d3d5ca6..0000000 --- a/volumes/so/config/asdc-controller/onapheat/override.yaml +++ /dev/null @@ -1,78 +0,0 @@ -aai: - auth: 2630606608347B7124C244AB0FE34F6F - -server: - port: 8085 - -spring: - datasource: - url: jdbc:mariadb://mariadb:3306/catalogdb - username: cataloguser - password: catalog123 - driver-class-name: org.mariadb.jdbc.Driver - dbcp2: - initial-size: 5 - max-total: 20 - validation-query: select 1 - test-on-borrow: true - - security: - usercredentials: - - - username: asdc - password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' - role: Asdc-Client - - - username: mso_admin - password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' - role: ACTUATOR - -request: - datasource: - url: jdbc:mariadb://mariadb:3306/requestdb - username: requestuser - password: request123 - driver-class-name: org.mariadb.jdbc.Driver - dbcp2: - initial-size: 5 - max-total: 20 - validation-query: select 1 - test-on-borrow: true - -mso: - msoKey: 07a7159d3bf51a0e53be7a8f89699be7 - logPath: ./logs/asdc - catalog: - db: - spring: - endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082 - db: - auth: Basic YnBlbDpwYXNzd29yZDEk - site-name: onapheat - aai: - endpoint: https://aai.api.simpledemo.onap.org:8443 - asdc-connections: - asdc-controller1: - user: mso - consumerGroup: SO-OpenSource-Env11 - consumerId: SO-COpenSource-Env11 - environmentName: AUTO - asdcAddress: c2.vm1.sdc.simpledemo.onap.org:8443 - password: 613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247 - pollingInterval: 60 - pollingTimeout: 60 - relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL - activateServerTLSAuth: false - keyStorePassword: - keyStorePath: - watchDogTimeout: 60 - isFitlerInEmptyResources: true - messageBusAddress: vm1.mr.simpledemo.onap.org,vm1.mr.simpledemo.onap.org - asdc: - config: - key: 566B754875657232314F5548556D3665 - components: - count: 3, - componentNames: SO,AAI,SDNC - scheduling: - enabled: false diff --git a/volumes/so/config/sdc-controller/onapheat/override.yaml b/volumes/so/config/sdc-controller/onapheat/override.yaml new file mode 100644 index 0000000..d3d5ca6 --- /dev/null +++ b/volumes/so/config/sdc-controller/onapheat/override.yaml @@ -0,0 +1,78 @@ +aai: + auth: 2630606608347B7124C244AB0FE34F6F + +server: + port: 8085 + +spring: + datasource: + url: jdbc:mariadb://mariadb:3306/catalogdb + username: cataloguser + password: catalog123 + driver-class-name: org.mariadb.jdbc.Driver + dbcp2: + initial-size: 5 + max-total: 20 + validation-query: select 1 + test-on-borrow: true + + security: + usercredentials: + - + username: asdc + password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' + role: Asdc-Client + - + username: mso_admin + password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke' + role: ACTUATOR + +request: + datasource: + url: jdbc:mariadb://mariadb:3306/requestdb + username: requestuser + password: request123 + driver-class-name: org.mariadb.jdbc.Driver + dbcp2: + initial-size: 5 + max-total: 20 + validation-query: select 1 + test-on-borrow: true + +mso: + msoKey: 07a7159d3bf51a0e53be7a8f89699be7 + logPath: ./logs/asdc + catalog: + db: + spring: + endpoint: http://c1.vm1.mso.simpledemo.onap.org:8082 + db: + auth: Basic YnBlbDpwYXNzd29yZDEk + site-name: onapheat + aai: + endpoint: https://aai.api.simpledemo.onap.org:8443 + asdc-connections: + asdc-controller1: + user: mso + consumerGroup: SO-OpenSource-Env11 + consumerId: SO-COpenSource-Env11 + environmentName: AUTO + asdcAddress: c2.vm1.sdc.simpledemo.onap.org:8443 + password: 613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247 + pollingInterval: 60 + pollingTimeout: 60 + relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL + activateServerTLSAuth: false + keyStorePassword: + keyStorePath: + watchDogTimeout: 60 + isFitlerInEmptyResources: true + messageBusAddress: vm1.mr.simpledemo.onap.org,vm1.mr.simpledemo.onap.org + asdc: + config: + key: 566B754875657232314F5548556D3665 + components: + count: 3, + componentNames: SO,AAI,SDNC + scheduling: + enabled: false -- cgit 1.2.3-korg