diff options
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/ansible-server/pom.xml | 2 | ||||
| -rw-r--r-- | installation/dmaap-listener/pom.xml | 2 | ||||
| -rw-r--r-- | installation/pom.xml | 2 | ||||
| -rw-r--r-- | installation/sdnc-web/pom.xml | 2 | ||||
| -rw-r--r-- | installation/sdnc/pom.xml | 24 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 6 | ||||
| -rw-r--r-- | installation/sdnc/src/main/resources/README-custom-certs.md | 3 | ||||
| -rwxr-xr-x | installation/src/main/properties/aaiclient.properties | 4 | ||||
| -rw-r--r-- | installation/src/main/properties/generic-resource-api-dg.properties | 46 | ||||
| -rw-r--r-- | installation/ueb-listener/pom.xml | 2 |
10 files changed, 61 insertions, 32 deletions
diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index fb595cd2..bf3952ee 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <artifactId>installation-ansible-server</artifactId> diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index a0f6458a..e665ea86 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <artifactId>installation-dmaap-listener</artifactId> diff --git a/installation/pom.xml b/installation/pom.xml index 64855630..6d15a404 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <artifactId>installation</artifactId> diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 3a096ffd..0f2c03ca 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <artifactId>installation-sdnc-web</artifactId> diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 03b3af6a..0466298d 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <artifactId>installation-sdnc</artifactId> @@ -180,7 +180,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.34.0</version> + <version>0.39.0</version> <inherited>false</inherited> <configuration> <images> @@ -364,6 +364,26 @@ </resources> </configuration> </execution> + <execution> + <id>copy-certificates</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/resources</directory> + <includes> + <include>*.pem</include> + <include>*.md</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> </executions> </plugin> <plugin> diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index e281d16b..4946dfe1 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -16,6 +16,12 @@ ENV SDNC_SECUREPORT ${sdnc.secureport} ARG AAF=false +# Copy any certs +COPY *.md *.pem /etc/ssl/certs/ + +# Install certs +RUN update-ca-certificates + # Copy deliverables to opt COPY opt /opt RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc diff --git a/installation/sdnc/src/main/resources/README-custom-certs.md b/installation/sdnc/src/main/resources/README-custom-certs.md new file mode 100644 index 00000000..ac414c11 --- /dev/null +++ b/installation/sdnc/src/main/resources/README-custom-certs.md @@ -0,0 +1,3 @@ +Any .pem files in this directory will be copied to /etc/ssl/certs on the +docker container and installed prior to running apk. This might be needed, +for example, for docker builds to work properly behind a corporate firewall. diff --git a/installation/src/main/properties/aaiclient.properties b/installation/src/main/properties/aaiclient.properties index 395510d7..b7df0a83 100755 --- a/installation/src/main/properties/aaiclient.properties +++ b/installation/src/main/properties/aaiclient.properties @@ -54,8 +54,8 @@ org.onap.ccsdk.sli.adaptors.aai.update=/aai/v13/actions/update # UBB Notify org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v13/actions/notify -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/rests/data/L3SDN-API:services/layer3-service-list={service-instance-id}?content=config +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/rests/data/L3AVPN-EVC-API:services/service-list={service-instance-id}/service-data/avpn-logicalchannel-information?content=config # P-Interfaces org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v13/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties index 054ced81..a32892ad 100644 --- a/installation/src/main/properties/generic-resource-api-dg.properties +++ b/installation/src/main/properties/generic-resource-api-dg.properties @@ -77,30 +77,30 @@ restapi.ss.mS.mac.address.unassign.templatefile=self-serve-mS-mac-address-unassi cloud-region.cloud-owner=CloudOwner # URLs -restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/ -restapi.sz-allottedresource=/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/ -restapi.brg-allottedresource=/restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/{allotted-resource-id}/ -restapi.vpp-honeycomb=/restconf/config/ietf-interfaces:interfaces/interface/{tunnel-name} -restapi.tx-allottedresource=/restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/{allotted-resource-id}/ -restapi.vnf-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/ -restapi.network-provided-allottedresource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vnf-provided-allotted-resources/ -restapi.pm-configuration=/restconf/config/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration/{configuration-id}/ -restapi.network=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks -restapi.vnf=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs -restapi.vnf-api.service-information=/restconf/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data -restapi.parent-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-allotted-resources/provided-allotted-resource/{allotted-resource-id}/ -restapi.network-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-provided-allotted-resources/ -restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id} -restapi.service.vnf.vfmodule-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id} -restapi.connection-attachment-allottedresource=/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/ +restapi.cr-allottedresource=/rests/data/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource={allotted-resource-id}?content=config +restapi.sz-allottedresource=/rests/data/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource={allotted-resource-id}?content=config +restapi.brg-allottedresource=/rests/data/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource={allotted-resource-id}?content=config +restapi.vpp-honeycomb=/rests/data/ietf-interfaces:interfaces/interface={tunnel-name}?content=config +restapi.tx-allottedresource=/rests/data/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource={allotted-resource-id}?content=config +restapi.vnf-provided-allottedresource=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/vnfs/vnf={vnf-id}/vnf-data/vnf-provided-allotted-resources?content=config +restapi.network-provided-allottedresource=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/vnfs/vnf={vnf-id}/vnf-data/vnf-provided-allotted-resources?content=config +restapi.pm-configuration=/rests/data/GENERIC-RESOURCE-API:port-mirror-configurations/port-mirror-configuration={configuration-id}?content=config +restapi.network=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/networks?content=config +restapi.vnf=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/vnfs?content=config +restapi.vnf-api.service-information=/rests/data/VNF-API:vnfs/vnf-list={vnf-id}/service-data?content=config +restapi.parent-provided-resource=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/provided-allotted-resources/provided-allotted-resource={allotted-resource-id}?content=config +restapi.network-provided-resource=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/networks/network={network-id}/network-data/network-provided-allotted-resources?content=config +restapi.services=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}?content=config +restapi.service.vnf.vfmodule-resource=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/vnfs/vnf={vnf-id}/vnf-data/vf-modules/vf-module={vf-module-id}?content=config +restapi.connection-attachment-allottedresource=/rests/data/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource={allotted-resource-id}?content=config restapi.naming.gen-name.service=/web/service/v1/genNetworkElementName -restapi.ss-pnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/ -restapi.ss-vnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/ -restapi.ss-vfmodule-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/ +restapi.ss-pnf-assignments=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/pnfs/pnf={pnf-id}?content=config +restapi.ss-vnf-assignments=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/vnfs/vnf={vnf-id}?content=config +restapi.ss-vfmodule-assignments=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/vnfs/vnf={vnf-id}/vnf-data/vf-modules/vf-module={vf-module-id}?content=config restapi.ss-mS-vlan-tag-assign=/vlantagapi/v1/{action} restapi.ss-mS-mac-address-assign=/api/macaddress/v1/service/assign restapi.ss-mS-mac-address-unassign=/api/macaddress/v1/service/unassign -restapi.preload-network=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/{network-name}/network/preload-data/preload-network-topology-information/ -restapi.preloadinformation=/restconf/config/GENERIC-RESOURCE-API:preload-information/preload-list/ -restapi.vf-module=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/ -restapi.vnf-assign=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}
\ No newline at end of file +restapi.preload-network=/rests/data/GENERIC-RESOURCE-API:preload-information/preload-list={network-name}/network/preload-data/preload-network-topology-information?content=config +restapi.preloadinformation=/rests/data/GENERIC-RESOURCE-API:preload-information/preload-list?content=config +restapi.vf-module=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/vnfs/vnf={vnf-id}/vnf-data/vf-modules/vf-module={vf-module-id}?content=config +restapi.vnf-assign=/rests/data/GENERIC-RESOURCE-API:services/service={service-instance-id}/service-data/vnfs/vnf={vnf-id}?content=config
\ No newline at end of file diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 585b423a..dfb44227 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>3.0.1-SNAPSHOT</version> </parent> <artifactId>installation-ueb-listener</artifactId> |