Merge "Updates for ODL Neon"
authorDan Timoney <dtimoney@att.com>
Fri, 16 Aug 2019 19:15:37 +0000 (19:15 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 16 Aug 2019 19:15:37 +0000 (19:15 +0000)
22 files changed:
alpine/pom.xml
ansible-server/pom.xml
dependencies/pom.xml
dgbuilder-docker/pom.xml
dgbuilder/pom.xml
odlsli/odlsli-alpine/pom.xml
odlsli/odlsli-alpine/src/main/docker/Dockerfile
odlsli/odlsli-ubuntu/pom.xml
odlsli/pom.xml
opendaylight/neon/neon-alpine/pom.xml
opendaylight/neon/pom.xml
opendaylight/pom.xml
platform-logic/asdc-api/pom.xml
platform-logic/installer/pom.xml
platform-logic/oofpcipoc-api/pom.xml
platform-logic/pom.xml
platform-logic/restapi-templates/pom.xml
platform-logic/sliapi/pom.xml
pom.xml
saltstack-server/pom.xml
ubuntu/pom.xml
version.properties

index 21a458a..5cdd262 100644 (file)
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-alpine</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: alpine</name>
index 3e29bba..8f34728 100644 (file)
@@ -4,14 +4,14 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3</version>
+               <version>1.4.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>ansible-server</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
 
        <name>ccsdk :: distribution :: ${project.artifactId}</name>
        <description>Creates ansible-server Docker container</description>
index a45ed4f..f1339d1 100755 (executable)
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.3</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>dependencies</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution:: dependencies</name>
index a51f392..91f1715 100644 (file)
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-root</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-dgbuilder-docker</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: dgbuilder-docker</name>
index 55c233d..ec93d2f 100644 (file)
@@ -5,12 +5,12 @@
        <parent>
             <groupId>org.onap.ccsdk.distribution</groupId>
             <artifactId>distribution-root</artifactId>
-            <version>0.5.2-SNAPSHOT</version>
+            <version>0.6.0-SNAPSHOT</version>
         </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-dgbuilder</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: dgbuilder</name>
index 723b088..2bee080 100644 (file)
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-odlsli-alpine</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: odlsli-alpine</name>
        </organization>
 
        <properties>
-           <base.image.name>onap/ccsdk-odl-fluorine-alpine-image</base.image.name>
+           <base.image.name>onap/ccsdk-odl-neon-alpine-image</base.image.name>
                <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
                <ccsdk.project.version>${project.version}</ccsdk.project.version>
                <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-               <ccsdk.features.version>0.5.2</ccsdk.features.version>
+               <ccsdk.features.version>0.6.0-SNAPSHOT</ccsdk.features.version>
                <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                <opendaylight.root>opt/opendaylight</opendaylight.root>
                <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
                <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
                
-               <ccsdk.sli.core.version>0.5.2</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.5.2</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.5.2</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.5.2</ccsdk.sli.plugins.version>
+               <ccsdk.sli.core.version>0.6.0-SNAPSHOT</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.6.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.6.0-SNAPSHOT</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.6.0-SNAPSHOT</ccsdk.sli.plugins.version>
        </properties>
 
        <dependencies>
index 97c5ae4..024043b 100644 (file)
@@ -37,9 +37,14 @@ ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra}
 # Install sudo and IP utilities
 RUN apk update && apk --no-cache add sudo iputils openssl
 
+
 # Enable wheel group
 RUN sed -e 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' -i /etc/sudoers
 
+# Create odl user
+RUN addgroup -S odl && adduser -S odl -G odl
+RUN addgroup odl wheel
+
 COPY --from=stage0 --chown=odl:odl /opt /opt
 
 # Add CCSDK repositories to boot repositories
index 63da0da..ede4824 100644 (file)
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.3.3</version>
+               <version>1.4.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
@@ -25,7 +25,7 @@
                <image.name>onap/ccsdk-odlsli-image</image.name>
                <ccsdk.project.version>${project.version}</ccsdk.project.version>
                <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-               <ccsdk.features.version>0.5.2</ccsdk.features.version>
+               <ccsdk.features.version>0.6.0-SNAPSHOT</ccsdk.features.version>
                <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                <opendaylight.root>opt/opendaylight</opendaylight.root>
                <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features>
                <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
 
-               <ccsdk.sli.core.version>0.5.2</ccsdk.sli.core.version>
-               <ccsdk.sli.adaptors.version>0.5.2</ccsdk.sli.adaptors.version>
-               <ccsdk.sli.northbound.version>0.5.2</ccsdk.sli.northbound.version>
-               <ccsdk.sli.plugins.version>0.5.2</ccsdk.sli.plugins.version>
+               <ccsdk.sli.core.version>0.6.0-SNAPSHOT</ccsdk.sli.core.version>
+               <ccsdk.sli.adaptors.version>0.6.0-SNAPSHOT</ccsdk.sli.adaptors.version>
+               <ccsdk.sli.northbound.version>0.6.0-SNAPSHOT</ccsdk.sli.northbound.version>
+               <ccsdk.sli.plugins.version>0.6.0-SNAPSHOT</ccsdk.sli.plugins.version>
        </properties>
 
        <dependencies>
index 98986b0..0e12e26 100644 (file)
@@ -5,18 +5,17 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odlsli</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli</name>
     <description>Creates ODLSLI containers</description>
 
     <modules>
-           <module>odlsli-ubuntu</module>
            <module>odlsli-alpine</module>
     </modules>
 </project>
index 0213c3a..ad274cf 100644 (file)
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-odl-neon</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>distribution-odl-neon-alpine</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
index 6564b68..3dbf5e1 100644 (file)
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-opendaylight</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odl-neon</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: opendaylight</name>
index 6fe0314..d91a4d8 100644 (file)
@@ -5,19 +5,17 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-opendaylight</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: opendaylight</name>
     <description>Creates OpenDaylight container</description>
 
     <modules>
-        <module>fluorine</module>
         <module>neon</module>
-           
     </modules>
 </project>
index f92b6ad..39cd657 100644 (file)
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>platform-logic-asdcapi</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
index 2a77aa8..ee6a2d0 100644 (file)
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-installer</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
index b7ec28c..00a905d 100644 (file)
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>platform-logic-oofpcipocapi</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
index 0051aca..adee554 100644 (file)
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-root</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>distribution-platform-logic</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic</name>
index d89e1f5..0f54a8a 100644 (file)
@@ -5,11 +5,11 @@
     <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
     <artifactId>platform-logic-restapi-templates</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
index 896120b..cf6fc5a 100644 (file)
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.5.2-SNAPSHOT</version>
+               <version>0.6.0-SNAPSHOT</version>
        </parent>
 
        <artifactId>platform-logic-sliapi</artifactId>
-       <version>0.5.2-SNAPSHOT</version>
+       <version>0.6.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>
diff --git a/pom.xml b/pom.xml
index a4dc0fc..b02e5d0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.3.3</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-root</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution</name>
index 9310b1a..7e9f1e8 100644 (file)
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>saltstack-server</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: saltstack-server</name>
index 55a0558..0f88ebc 100644 (file)
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.5.2-SNAPSHOT</version>
+        <version>0.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-ubuntu</artifactId>
-    <version>0.5.2-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: ubuntu</name>
index 6a35b90..50be578 100644 (file)
@@ -5,8 +5,8 @@
 
 
 release_name=0
-sprint_number=5
-feature_revision=2
+sprint_number=6
+feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 

© 2017 ONAP. Copyright © The Linux Foundation ®. All Rights Reserved.
The Linux Foundation has registered trademarks and uses trademarks.
For a list of trademarks of The Linux Foundation, please see our Trademark Usage page.
Linux is a registered trademark of Linus Torvalds.
Privacy Policy and Terms of Use