Merge "Small bug fixes mostly syntax errors in some DGs."

Former-commit-id: 6a897ad8bd1a7ab8c3ff57106399a3f98332399a

diff --git a/installation/ansible-server/src/main/Dockerfile b/installation/ansible-server/src/main/Dockerfile
index 726d606..3eb18db 100644 (file)
--- a/installation/ansible-server/src/main/Dockerfile
+++ b/installation/ansible-server/src/main/Dockerfile
@@ -1,5 +1,4 @@
-#FROM onap/ccsdk-ansible-server-image:${ccsdk.docker.version}
-FROM onap/ccsdk-ansible-server-image:0.4-STAGING-latest
+FROM onap/ccsdk-ansible-server-image:${ccsdk.docker.version}
 
 LABEL maintainer="SDN-C Team (sdnc@lists.openecomp.org)"
 

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index ad11946..037c4e9 100644 (file)
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -22,7 +22,7 @@
                <sdnc.project.version>${project.version}</sdnc.project.version>
                <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
                <ccsdk.groupId>org.onap.ccsdk.features.sdnr.wt</ccsdk.groupId>
-               <ccsdk.features.version>0.7.1</ccsdk.features.version>
+               <ccsdk.features.version>0.7.2</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>
                <docker.push.phase>deploy</docker.push.phase>

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 39072ec..63d3a21 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -22,8 +22,8 @@
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
         <sdnc.northbound.version>1.8.0</sdnc.northbound.version>
-        <ccsdk.docker.version>0.7.1</ccsdk.docker.version>
-        <ccsdk.features.version>0.7.1</ccsdk.features.version>
+        <ccsdk.docker.version>0.7.2</ccsdk.docker.version>
+        <ccsdk.features.version>0.7.2</ccsdk.features.version>
         <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
         <sdnc.keypass><![CDATA[ff^G9D]yf&r}Ktum@BJ0YB?N]]></sdnc.keypass>
         <sdnc.secureport>8443</sdnc.secureport>

diff --git a/installation/sdnc/src/main/resources/ipam.data.dump b/installation/sdnc/src/main/resources/ipam.data.dump
index 94dd19b..3aa8c62 100644 (file)
--- a/installation/sdnc/src/main/resources/ipam.data.dump
+++ b/installation/sdnc/src/main/resources/ipam.data.dump
@@ -40,7 +40,7 @@ CREATE TABLE `IPAM_IP_POOL` (
 
 LOCK TABLES `IPAM_IP_POOL` WRITE;
 /*!40000 ALTER TABLE `IPAM_IP_POOL` DISABLE KEYS */;
-INSERT INTO `IPAM_IP_POOL` VALUES (1,'2018-08-17 20:15:12',3,'10.0.0.0/8',4,'ACTIVE','management'),(2,'2018-08-17 20:19:29',2,'192.168.10.0/24',4,'ACTIVE','private1'),(3,'2018-08-17 20:20:08',1,'192.168.20.0/24',4,'ACTIVE','private2');
+INSERT INTO `IPAM_IP_POOL` VALUES (1,'2018-08-17 20:15:12',3,'10.0.101.0/24',4,'ACTIVE','management'),(2,'2018-08-17 20:19:29',2,'192.168.10.0/24',4,'ACTIVE','private1'),(3,'2018-08-17 20:20:08',1,'192.168.20.0/24',4,'ACTIVE','private2');
 /*!40000 ALTER TABLE `IPAM_IP_POOL` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index d6fb5c8..9757605 100644 (file)
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -18,7 +18,7 @@
     <description>Copies base ONAP platform-logic</description>
 
     <properties>
-        <ccsdk.distribution.version>0.7.1</ccsdk.distribution.version>
+        <ccsdk.distribution.version>0.7.2</ccsdk.distribution.version>
     </properties>
 
     <build>

diff --git a/releases/1.8.0-container.yaml b/releases/1.8.0-container.yaml
new file mode 100644 (file)
index 0000000..688b292
--- /dev/null
+++ b/releases/1.8.0-container.yaml
@@ -0,0 +1,21 @@
+---
+distribution_type: 'container'
+container_release_tag: '1.8.0'
+project: 'sdnc-oam'
+log_dir: 'sdnc-oam-maven-docker-stage-master/230/'
+ref: 614a16a8fb98b477e65446d5a47777f99e65c281
+containers:
+    - name: 'sdnc-ansible-server-image'
+      version: '1.8.0-STAGING-20200312T153612Z'
+    - name: 'sdnc-aaf-image'
+      version: '1.8.0-STAGING-20200312T153612Z'
+    - name: 'sdnc-image'
+      version: '1.8.0-STAGING-20200312T153612Z'
+    - name: 'sdnc-web-image'
+      version: '1.8.0-STAGING-20200312T153612Z'
+    - name: 'admportal-sdnc-image'
+      version: '1.8.0-STAGING-20200312T153612Z'
+    - name: 'sdnc-ueb-listener-image'
+      version: '1.8.0-STAGING-20200312T153612Z'
+    - name: 'sdnc-dmaap-listener-image'
+      version: '1.8.0-STAGING-20200312T153612Z'

diff --git a/releases/1.8.0.yaml b/releases/1.8.0.yaml
new file mode 100644 (file)
index 0000000..6a398ad
--- /dev/null
+++ b/releases/1.8.0.yaml
@@ -0,0 +1,5 @@
+---
+distribution_type: 'maven'
+version: '1.8.0'
+project: 'sdnc-oam'
+log_dir: 'sdnc-oam-maven-stage-master/315/'