summaryrefslogtreecommitdiffstats
path: root/installation
diff options
context:
space:
mode:
Diffstat (limited to 'installation')
-rw-r--r--installation/ansible-server/pom.xml4
-rw-r--r--installation/dmaap-listener/pom.xml6
-rw-r--r--installation/pom.xml4
-rw-r--r--installation/sdnc-web/pom.xml4
-rw-r--r--installation/sdnc/pom.xml8
-rwxr-xr-xinstallation/sdnc/src/main/docker/Dockerfile3
-rwxr-xr-xinstallation/sdnc/src/main/docker/standalone.Dockerfile2
-rw-r--r--installation/src/main/properties/svclogic-compiler.properties29
-rw-r--r--installation/src/main/yaml/docker-compose.yml3
-rw-r--r--installation/ueb-listener/pom.xml6
-rw-r--r--installation/ueb-listener/src/main/docker/Dockerfile4
11 files changed, 55 insertions, 18 deletions
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml
index db7276f5..c879daa1 100644
--- a/installation/ansible-server/pom.xml
+++ b/installation/ansible-server/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-ansible-server</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index a0b12391..9c747150 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-dmaap-listener</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
@@ -23,7 +23,7 @@
<image.name>onap/sdnc-dmaap-listener-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
- <ccsdk.docker.version>1.1-STAGING-latest</ccsdk.docker.version>
+ <ccsdk.docker.version>1.1.1</ccsdk.docker.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
</properties>
diff --git a/installation/pom.xml b/installation/pom.xml
index 967b598f..42aa96b6 100644
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>sdnc-oam</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation</name>
diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index 8b35f551..e41fa2b7 100644
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-sdnc-web</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index be951d2d..ae5f2342 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-sdnc</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
@@ -24,8 +24,8 @@
<standalone.image.name>onap/sdnc-image</standalone.image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
- <sdnc.northbound.version>2.1.1-SNAPSHOT</sdnc.northbound.version>
- <ccsdk.docker.version>1.1.1-SNAPSHOT-latest</ccsdk.docker.version>
+ <sdnc.northbound.version>2.1.1</sdnc.northbound.version>
+ <ccsdk.docker.version>1.1.1</ccsdk.docker.version>
<sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
<sdnc.keypass><![CDATA[;:G58,7ZhqOSI:7^oZCY[9Dv]]></sdnc.keypass>
<sdnc.secureport>8443</sdnc.secureport>
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index de928934..4de1bb3f 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -53,6 +53,9 @@ RUN echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_H
RUN echo org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
RUN echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
+# Overwrite svclogic compiler properties
+RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties
+
RUN chown -R odl:odl /opt
USER odl
diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile
index fe6aa083..03f5eb9b 100755
--- a/installation/sdnc/src/main/docker/standalone.Dockerfile
+++ b/installation/sdnc/src/main/docker/standalone.Dockerfile
@@ -50,6 +50,8 @@ RUN echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_H
RUN echo org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
RUN echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
+# Overwrite svclogic compiler properties
+RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties
RUN chown -R odl:odl /opt
USER odl
diff --git a/installation/src/main/properties/svclogic-compiler.properties b/installation/src/main/properties/svclogic-compiler.properties
new file mode 100644
index 00000000..5a228f9f
--- /dev/null
+++ b/installation/src/main/properties/svclogic-compiler.properties
@@ -0,0 +1,29 @@
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# Copyright (C) 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.
+# ============LICENSE_END=========================================================
+###
+
+# svclogic properties for compiler, which uses jdbc instead of dblib. This version
+# should be installed in $SDNC_ROOT/svclogic/config
+
+org.onap.ccsdk.sli.dbtype = jdbc
+org.onap.ccsdk.sli.jdbc.url = jdbc:mysql://dbhost:3306/${MYSQL_DATABASE}
+org.onap.ccsdk.sli.jdbc.database = ${MYSQL_DATABASE}
+org.onap.ccsdk.sli.jdbc.user = ${MYSQL_USER}
+org.onap.ccsdk.sli.jdbc.password = ${MYSQL_PASSWORD}
diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index 01c972c4..6a2e3ff0 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -66,6 +66,9 @@ services:
- ansible:ansiblehost
environment:
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+ - MYSQL_USER=${MYSQL_USER}
+ - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+ - MYSQL_DATABASE=${MYSQL_DATABASE}
- SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
- SDNC_BIN=/opt/onap/sdnc/bin
- ODL_CERT_DIR=/tmp
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 012c75b3..a7c58133 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-ueb-listener</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
@@ -23,7 +23,7 @@
<image.name>onap/sdnc-ueb-listener-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
- <ccsdk.docker.version>1.0-STAGING-latest</ccsdk.docker.version>
+ <ccsdk.docker.version>1.1.1</ccsdk.docker.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<docker.push.phase>deploy</docker.push.phase>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile
index 4f34a0d9..88d31e31 100644
--- a/installation/ueb-listener/src/main/docker/Dockerfile
+++ b/installation/ueb-listener/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
# Base alpine with added packages needed for open ecomp
-FROM onap/ccsdk-alpine-image:${ccsdk.docker.version} AS stage0
+FROM onap/ccsdk-alpine-j11-image:${ccsdk.docker.version} AS stage0
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
@@ -9,7 +9,7 @@ COPY opt /opt
# End of stage0
-FROM onap/ccsdk-alpine-image:${ccsdk.docker.version}
+FROM onap/ccsdk-alpine-j11-image:${ccsdk.docker.version}
MAINTAINER SDNC Team (onap-sdnc@lists.onap.org)
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties