diff options
24 files changed, 87 insertions, 35 deletions
diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index e12759cd..666dbc7f 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>2.2.1</version> + <version>2.3.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/admportal/pom.xml b/admportal/pom.xml index 67367831..5c3bb19d 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.2.1</version> + <version>2.3.0-SNAPSHOT</version> <relativePath/> </parent> diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 073aad35..3e235abd 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>2.2.1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> diff --git a/data-migrator/pom.xml b/data-migrator/pom.xml index 8eaba23f..69b3e43f 100644 --- a/data-migrator/pom.xml +++ b/data-migrator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>data-migrator</artifactId> diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 6bfbbeb3..a76bf357 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.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>installation-ansible-server</artifactId> diff --git a/installation/ansible-server/src/main/dc/docker-compose.yaml b/installation/ansible-server/src/main/dc/docker-compose.yaml new file mode 100644 index 00000000..371aabde --- /dev/null +++ b/installation/ansible-server/src/main/dc/docker-compose.yaml @@ -0,0 +1,52 @@ +version: '2.1' + +networks: + default: + driver: bridge + driver_opts: + com.docker.network.driver.mtu: ${MTU} + + +services: + + db: + image: mariadb:10.5 + container_name: sdnc_db_container + ports: + - "23306:3306" + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_ROOT_HOST=% + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + + ansible: + image: onap/sdnc-ansible-server-image:latest + depends_on : + - db + container_name: sdnc_ansible_container + entrypoint: ["/opt/ansible-server/startAnsibleServer.sh"] + ports: + - "8000" + links: + - db:dbhost + - db:sdnctldb01 + - db:sdnctldb02 + environment: + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + - ANSIBLE_TRUSTSTORE_PASSWORD=${ANSIBLE_TRUSTSTORE_PASSWORD} + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 8e490a00..4dad6354 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.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>installation-dmaap-listener</artifactId> diff --git a/installation/pom.xml b/installation/pom.xml index 4d6b57d3..fa6062b3 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.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>installation</artifactId> diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index b3a935bf..8817c936 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.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>installation-sdnc-web</artifactId> diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index fd45b007..11118491 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.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>installation-sdnc</artifactId> diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml index 110f940b..f4cf673d 100644 --- a/installation/src/main/yaml/docker-compose.yml +++ b/installation/src/main/yaml/docker-compose.yml @@ -31,7 +31,7 @@ services: depends_on : - db container_name: sdnc_ansible_container - entrypoint: ["/opt/onap/ccsdk/startAnsibleServer.sh"] + entrypoint: ["/opt/ansible-server/startAnsibleServer.sh"] ports: - "8000" links: diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 2ccbde80..60641de7 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.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>installation-ueb-listener</artifactId> diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index bdcb95b5..018fe2c9 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-datachange</artifactId> diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index b3155499..95b0e6e8 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-generic-resource-api</artifactId> diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 6b97c7a0..ffba78bf 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-installer</artifactId> diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index d1259096..8e0a03e9 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-lcm</artifactId> diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index 657dd185..893fe3ba 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-optical-service</artifactId> diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index d7660afb..85d9ec72 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>platform-logic</artifactId> diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 9a049b46..a054e88a 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-restapi-templates</artifactId> diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index f27b12f0..3dca238b 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-restconfapi-yang</artifactId> diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index afe6e800..0b62d169 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-setup</artifactId> diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 479855cb..66924b8e 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>platform-logic-vnfapi</artifactId> @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.2.1</version> + <version>2.3.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam</name> @@ -25,17 +25,17 @@ <sdnc.project.version>${project.version}</sdnc.project.version> <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite --> - <ccsdk.oran.a1adapter.version>1.2.1</ccsdk.oran.a1adapter.version> - <sdnc.northbound.version>2.2.0</sdnc.northbound.version> <!-- Used by installation/sdnc --> - <ccsdk.distribution.version>1.2.1</ccsdk.distribution.version> - <ccsdk.sli.version>1.3.1</ccsdk.sli.version> - <ccsdk.features.version>1.2.3</ccsdk.features.version> - <ccsdk.sli.northbound.version>1.3.1</ccsdk.sli.northbound.version> + <ccsdk.oran.a1adapter.version>1.3.0-SNAPSHOT</ccsdk.oran.a1adapter.version> + <sdnc.northbound.version>2.3.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc --> + <ccsdk.distribution.version>1.3.0-SNAPSHOT</ccsdk.distribution.version> + <ccsdk.sli.version>1.4.0-SNAPSHOT</ccsdk.sli.version> + <ccsdk.features.version>1.3.0-SNAPSHOT</ccsdk.features.version> + <ccsdk.sli.northbound.version>${ccsdk.sli.version}</ccsdk.sli.northbound.version> <!-- docker images versions --> - <ccsdk.docker.alpine.j11.version>1.2-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener --> - <ccsdk.docker.odlsli.alpine.version>1.2-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc --> - <ccsdk.docker.ansible.server.version>1.2-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server --> - <ccsdk.docker.ubuntu.version>1.2-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal --> + <ccsdk.docker.alpine.j11.version>1.3-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener --> + <ccsdk.docker.odlsli.alpine.version>1.3-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc --> + <ccsdk.docker.ansible.server.version>1.3-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server --> + <ccsdk.docker.ubuntu.version>1.3-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal --> </properties> <modules> diff --git a/version.properties b/version.properties index 1891b1f2..9bbfe902 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support release_name=2 -sprint_number=2 -feature_revision=1 +sprint_number=3 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} |