summaryrefslogtreecommitdiffstats
path: root/installation
diff options
context:
space:
mode:
Diffstat (limited to 'installation')
-rw-r--r--installation/admportal/pom.xml10
-rw-r--r--installation/dgbuilder/pom.xml10
-rw-r--r--installation/dmaap-listener/pom.xml47
-rw-r--r--installation/pom.xml12
-rw-r--r--installation/sdnc/pom.xml12
-rw-r--r--installation/sdnc/src/main/scripts/installFeatures.sh77
-rw-r--r--installation/sdnc/src/main/scripts/startODL.sh4
-rw-r--r--installation/ubuntu/pom.xml134
-rw-r--r--installation/ubuntu/src/main/docker/Dockerfile24
-rw-r--r--installation/ueb-listener/pom.xml48
10 files changed, 83 insertions, 295 deletions
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 6266049b..ca823723 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -3,18 +3,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>installation</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-admportal</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
- <name>Installation - admportal</name>
+ <name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates admportal Docker container</description>
<properties>
diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml
index ceed5c32..fc19d352 100644
--- a/installation/dgbuilder/pom.xml
+++ b/installation/dgbuilder/pom.xml
@@ -3,18 +3,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>installation</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-dgbuilder</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
- <name>Installation - dgbuilder</name>
+ <name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates docker container for dgbuilder</description>
<properties>
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml
index c894a249..1e4cafa6 100644
--- a/installation/dmaap-listener/pom.xml
+++ b/installation/dmaap-listener/pom.xml
@@ -3,23 +3,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>installation</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>installation-dmaap-listener</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
- <name>Installation - dmaap-listener</name>
+ <name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates dmaap-listener Docker container</description>
<properties>
<image.name>onap/sdnc-dmaap-listener-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
- <ccsdk.project.version>0.1.0</ccsdk.project.version>
- <ccsdk.sli.northbound.version>0.1.1</ccsdk.sli.northbound.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
</properties>
@@ -39,20 +37,29 @@
</goals>
<configuration>
<source>
- println project.properties['sdnc.project.version'];
+ println
+ project.properties['sdnc.project.version'];
def versionArray;
- if ( project.properties['sdnc.project.version'] != null ) {
- versionArray = project.properties['sdnc.project.version'].split('\\.');
+ if (
+ project.properties['sdnc.project.version']
+ != null ) {
+ versionArray = project.properties['sdnc.project.version'].split('\\.');
}
- if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT"))
+ if
+ (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT"))
{
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0]
+ + '.' + versionArray[1] +
+ "-STAGING-latest";
} else {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0]
+ + '.' + versionArray[1] +
+ "-STAGING-latest";
}
- println 'New Tag for docker:' +
+ println 'New Tag for
+ docker:' +
project.properties['project.docker.latesttag.version'];
</source>
</configuration>
@@ -140,12 +147,12 @@
<phase>initialize</phase>
<configuration>
<artifactItems>
- <artifactItem>
- <groupId>org.onap.ccsdk.sli.northbound</groupId>
- <artifactId>dmaap-listener</artifactId>
- <type>zip</type>
- <version>${ccsdk.sli.northbound.version}</version>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.onap.ccsdk.sli.northbound</groupId>
+ <artifactId>dmaap-listener</artifactId>
+ <type>zip</type>
+ <version>${ccsdk.sli.northbound.version}</version>
+ </artifactItem>
</artifactItems>
<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/dmaap-listener</outputDirectory>
<excludes>bin/**,**/*-javadoc.jar,**/*-sources.jar</excludes>
diff --git a/installation/pom.xml b/installation/pom.xml
index 113a6088..ca4eb265 100644
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -3,18 +3,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>sdnc-oam</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
- <name>Installation</name>
+ <name>sdnc-oam :: installation</name>
<description>Installs SDN-C on local file system</description>
<properties>
@@ -22,7 +22,7 @@
<maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
<build.number>${maven.build.timestamp}</build.number>
- <ccsdk.distribution.version>v0.1.0</ccsdk.distribution.version>
+ <ccsdk.distribution.version>0.2.1-SNAPSHOT</ccsdk.distribution.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 0eaae82b..bafaed0e 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -3,24 +3,24 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>installation</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-sdnc</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
- <name>Installation - sdnc</name>
+ <name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates SDN Controller Docker container</description>
<properties>
<image.name>onap/sdnc-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
- <sdnc.northbound.version>1.2.2</sdnc.northbound.version>
+ <sdnc.northbound.version>1.3.1-SNAPSHOT</sdnc.northbound.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
</properties>
diff --git a/installation/sdnc/src/main/scripts/installFeatures.sh b/installation/sdnc/src/main/scripts/installFeatures.sh
index 29a3a70e..66c09b2e 100644
--- a/installation/sdnc/src/main/scripts/installFeatures.sh
+++ b/installation/sdnc/src/main/scripts/installFeatures.sh
@@ -24,90 +24,21 @@
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
+CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features}
-CCSDK_SLI_CORE_FEATURES=" \
- slicore-utils \
- dblib \
- filters \
- sli \
- sliPluginUtils \
- sliapi"
-CCSDK_SLI_ADAPTORS_FEATURES=" \
- aai-service \
- mdsal-resource \
- resource-assignment \
- sql-resource"
-
-CCSDK_SLI_NORTHBOUND_FEATURES=" \
- asdcApi \
- dataChange"
SDNC_NORTHBOUND_FEATURES=" \
generic-resource-api \
vnfapi \
vnftools"
-CCSDK_SLI_PLUGINS_FEATURES=" \
- properties-node \
- restapi-call-node"
-
-CCSDK_SLI_CORE_VERSION=${SDNC_CORE_VERSION:-0.0.1-SNAPSHOT}
-CCSDK_SLI_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.0.1-SNAPSHOT}
-CCSDK_SLI_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT}
-CCSDK_SLI_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.0.1-SNAPSHOT}
-SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.2.0-SNAPSHOT}
-
-echo "Enabling core features"
-${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-all
-${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-apidocs
-${ODL_HOME}/bin/client -u karaf feature:install odl-restconf-all
-
-
-echo "Installing CCSDK SLI core"
-for feature in ${CCSDK_SLI_CORE_FEATURES}
-do
- if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
- then
- ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
- else
- echo "No installer found for feature sdnc-${feature}"
- fi
-done
-
-echo "Installing CCSDK SLI adaptors"
-for feature in ${CCSDK_SLI_ADAPTORS_FEATURES}
-do
- if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
- then
- ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
- else
- echo "No installer found for feature sdnc-${feature}"
- fi
-done
-echo "Installing CCSDK SLI northbound"
-for feature in ${CCSDK_SLI_NORTHBOUND_FEATURES}
-do
- if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
- then
- ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
- else
- echo "No installer found for feature sdnc-${feature}"
- fi
-done
+SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.3.1-SNAPSHOT}
-echo "Installing CCSDK SLI plugins"
-for feature in ${CCSDK_SLI_PLUGINS_FEATURES}
-do
- if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ]
- then
- ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh
- else
- echo "No installer found for feature sdnc-${feature}"
- fi
-done
+# Install CCSDK features
+${CCSDK_HOME}/bin/installCcsdkFeatures.sh
echo "Installing SDN-C northbound"
diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index ec7fb791..6f35ad30 100644
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -28,8 +28,8 @@ function enable_odl_cluster(){
fi
echo "Installing Opendaylight cluster features"
- ${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-clustering
- ${ODL_HOME}/bin/client -u karaf feature:install odl-jolokia
+ ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering
+ ${ODL_HOME}/bin/client feature:install odl-jolokia
echo "Update cluster information statically"
hm=$(hostname)
diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml
deleted file mode 100644
index 4d8deb63..00000000
--- a/installation/ubuntu/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>installation</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>installation-ubuntu</artifactId>
- <version>1.3.0-SNAPSHOT</version>
-
- <name>Installation - ubuntu</name>
- <description>Creates base ubuntu Docker container</description>
-
- <properties>
- <image.name>onap/ubuntu-sdnc-image</image.name>
- <sdnc.project.version>${project.version}</sdnc.project.version>
- </properties>
-
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>
- println project.properties['sdnc.project.version'];
- def versionArray;
- if ( project.properties['sdnc.project.version'] != null ) {
- versionArray =
- project.properties['sdnc.project.version'].split('\\.');
- }
-
- if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
- } else {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
- }
-
- println 'New Tag for docker:' +
- project.properties['project.docker.latesttag.version'];
- </source>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
- <inherited>false</inherited>
- <configuration>
-
- <images>
- <image>
- <name>${image.name}</name>
- <build>
- <cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
- <tags>
- <tag>${project.version}</tag>
- <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
- <tag>${project.docker.latesttag.version}</tag>
- </tags>
- </build>
- </image>
- </images>
- </configuration>
- <executions>
- <execution>
- <id>generate-images</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
-
- <execution>
- <id>push-images</id>
- <phase>deploy</phase>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>copy-dockerfile</id>
- <goals>
- <goal>copy-resources</goal>
- </goals><!-- here the phase you need -->
- <phase>validate</phase>
- <configuration>
- <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/docker</directory>
- <includes>
- <include>Dockerfile</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
- <organization>
- <name>openECOMP</name>
- </organization>
-</project>
diff --git a/installation/ubuntu/src/main/docker/Dockerfile b/installation/ubuntu/src/main/docker/Dockerfile
deleted file mode 100644
index 464d4c0a..00000000
--- a/installation/ubuntu/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Base ubuntu with added packages needed for open ecomp
-FROM ubuntu:16.04
-MAINTAINER SDN-C Team (sdnc@lists.openecomp.org)
-
-ARG HTTP_PROXY
-ARG HTTPS_PROXY
-
-ENV HTTP_PROXY ${HTTP_PROXY}
-ENV HTTPS_PROXY ${HTTPS_PROXY}
-
-RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \
- if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
-
-# Add tools needed for OpenDaylight
-RUN apt-get update && apt-get install -y git \
- graphviz \
- openjdk-8-jdk \
- maven \
- mysql-client \
- nodejs \
- nodejs-legacy \
- npm \
- python-pip \
- unzip
diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml
index 4260154d..2c2c300e 100644
--- a/installation/ueb-listener/pom.xml
+++ b/installation/ueb-listener/pom.xml
@@ -3,23 +3,22 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.onap.sdnc.oam</groupId>
- <artifactId>installation</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>installation-ueb-listener</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
- <name>Installation - ueb-listener</name>
+ <name>sdnc-oam :: installation :: ${project.artifactId}</name>
<description>Creates ueb-listener Docker container</description>
<properties>
<image.name>onap/sdnc-ueb-listener-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
- <ccsdk.sli.northbound.version>0.2.0-SNAPSHOT</ccsdk.sli.northbound.version>
- <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+ <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
</properties>
@@ -38,20 +37,29 @@
</goals>
<configuration>
<source>
- println project.properties['sdnc.project.version'];
+ println
+ project.properties['sdnc.project.version'];
def versionArray;
- if ( project.properties['sdnc.project.version'] != null ) {
- versionArray = project.properties['sdnc.project.version'].split('\\.');
+ if (
+ project.properties['sdnc.project.version']
+ != null ) {
+ versionArray = project.properties['sdnc.project.version'].split('\\.');
}
- if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT"))
+ if
+ (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT"))
{
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0]
+ + '.' + versionArray[1] +
+ "-STAGING-latest";
} else {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+ project.properties['project.docker.latesttag.version']=versionArray[0]
+ + '.' + versionArray[1] +
+ "-STAGING-latest";
}
- println 'New Tag for docker:' +
+ println 'New Tag for
+ docker:' +
project.properties['project.docker.latesttag.version'];
</source>
</configuration>
@@ -139,12 +147,12 @@
<phase>initialize</phase>
<configuration>
<artifactItems>
- <artifactItem>
- <groupId>org.onap.ccsdk.sli.northbound</groupId>
- <artifactId>ueb-listener</artifactId>
- <type>zip</type>
- <version>${ccsdk.sli.northbound.version}</version>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.onap.ccsdk.sli.northbound</groupId>
+ <artifactId>ueb-listener</artifactId>
+ <type>zip</type>
+ <version>${ccsdk.sli.northbound.version}</version>
+ </artifactItem>
</artifactItems>
<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener</outputDirectory>
<excludes>bin/**,**/*-javadoc.jar,**/*-sources.jar</excludes>