From: Gary Wu Date: Mon, 19 Nov 2018 14:02:07 +0000 (+0000) Subject: Merge "Adaptation of PnP PNF simulator heat template" X-Git-Tag: 4.0.0-ONAP~343 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=31166e8ec36a152054b6bd561d637bc79aaa0ebf;hp=2e5561becbea5220be2a5da5e6c49b442ed14a8e;p=integration.git Merge "Adaptation of PnP PNF simulator heat template" --- diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env index 49d02c4fb..04fa44d76 100644 --- a/deployment/heat/onap-oom/env/tlab/onap-oom.env +++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env @@ -7,8 +7,8 @@ parameters: rancher_vm_flavor: m1.large k8s_vm_flavor: m1.xlarge - etcd_vm_flavor: m1.large - orch_vm_flavor: m1.large + etcd_vm_flavor: m1.medium + orch_vm_flavor: m1.medium public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9 @@ -22,8 +22,8 @@ parameters: pullPolicy: IfNotPresent robot: flavor: large - appcUsername: "admin" - appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" + appcUsername: "appc@appc.onap.org" + appcPassword: "demo123456!" openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" openStackPublicNetId: "__oam_network_id__" # NOTE: for TLAB, openStackPublicNetId needs to be oam_network_id instead of public_net_id openStackTenantId: "${OS_PROJECT_ID}" @@ -48,10 +48,9 @@ parameters: openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: - replicaCount: 1 + replicaCount: 3 config: - enableClustering: false - enableAAF: false + enableClustering: true openStackType: "OpenStackProvider" openStackName: "OpenStack" openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0" @@ -59,9 +58,7 @@ parameters: openStackDomain: "${OS_USER_DOMAIN_NAME}" openStackUserName: "${OS_USERNAME}" openStackEncryptedPassword: "${OS_PASSWORD}" - odlUser: admin - odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U sdnc: - replicaCount: 1 + replicaCount: 3 config: - enableClustering: false + enableClustering: true diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env index c6111843c..15819ffe1 100644 --- a/deployment/heat/onap-oom/env/windriver/onap-oom.env +++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env @@ -7,8 +7,8 @@ parameters: rancher_vm_flavor: m1.large k8s_vm_flavor: m1.xlarge - etcd_vm_flavor: m1.large - orch_vm_flavor: m1.large + etcd_vm_flavor: m1.medium + orch_vm_flavor: m1.medium public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 @@ -22,8 +22,8 @@ parameters: pullPolicy: IfNotPresent robot: flavor: large - appcUsername: "admin" - appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" + appcUsername: "appc@appc.onap.org" + appcPassword: "demo123456!" openStackKeyStoneUrl: "http://10.12.25.2:5000" openStackPublicNetId: "__public_net_id__" openStackTenantId: "${OS_PROJECT_ID}" @@ -49,10 +49,9 @@ parameters: openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: - replicaCount: 1 + replicaCount: 3 config: - enableClustering: false - enableAAF: false + enableClustering: true openStackType: "OpenStackProvider" openStackName: "OpenStack" openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0" @@ -60,9 +59,7 @@ parameters: openStackDomain: "${OS_USER_DOMAIN_NAME}" openStackUserName: "${OS_USERNAME}" openStackEncryptedPassword: "${OS_PASSWORD}" - odlUser: admin - odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U sdnc: - replicaCount: 1 + replicaCount: 3 config: - enableClustering: false + enableClustering: true diff --git a/deployment/heat/onap-oom/k8s_vm_init.sh b/deployment/heat/onap-oom/k8s_vm_init.sh new file mode 100644 index 000000000..5d162cb87 --- /dev/null +++ b/deployment/heat/onap-oom/k8s_vm_init.sh @@ -0,0 +1,21 @@ +#!/bin/bash -x +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +RANCHER_IMAGES=$(docker images | grep rancher | wc -l) +if [ $RANCHER_IMAGES -eq 0 ]; then + while [ ! -e /dockerdata-nfs/rancher_agent_cmd.sh ]; do + mount /dockerdata-nfs + sleep 10 + done + + cd ~ + cp /dockerdata-nfs/rancher_agent_cmd.sh . + sed -i "s/docker run/docker run -e CATTLE_HOST_LABELS='__host_label__=true' -e CATTLE_AGENT_IP=__host_private_ip_addr__/g" rancher_agent_cmd.sh + source rancher_agent_cmd.sh +fi diff --git a/deployment/heat/onap-oom/k8s_vm_init_serv.sh b/deployment/heat/onap-oom/k8s_vm_init_serv.sh new file mode 100644 index 000000000..153607739 --- /dev/null +++ b/deployment/heat/onap-oom/k8s_vm_init_serv.sh @@ -0,0 +1,98 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: k8s_vm_init.sh +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start daemon at boot time +# Description: Enable service provided by daemon. +### END INIT INFO + +dir="/opt" +cmd="./k8s_vm_init.sh" +user="root" + +name=`basename $0` +pid_file="/var/run/$name.pid" +stdout_log="/var/log/$name.log" +stderr_log="/var/log/$name.err" + +get_pid() { + cat "$pid_file" +} + +is_running() { + [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1 +} + +case "$1" in + start) + if is_running; then + echo "Already started" + else + echo "Starting $name" + cd "$dir" + if [ -z "$user" ]; then + sudo $cmd >> "$stdout_log" 2>> "$stderr_log" & + else + sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" & + fi + echo $! > "$pid_file" + if ! is_running; then + echo "Unable to start, see $stdout_log and $stderr_log" + exit 1 + fi + fi + ;; + stop) + if is_running; then + echo -n "Stopping $name.." + kill `get_pid` + for i in {1..10} + do + if ! is_running; then + break + fi + + echo -n "." + sleep 1 + done + echo + + if is_running; then + echo "Not stopped; may still be shutting down or shutdown may have failed" + exit 1 + else + echo "Stopped" + if [ -f "$pid_file" ]; then + rm "$pid_file" + fi + fi + else + echo "Not running" + fi + ;; + restart) + $0 stop + if is_running; then + echo "Unable to stop, will not attempt to start" + exit 1 + fi + $0 start + ;; + status) + if is_running; then + echo "Running" + else + echo "Stopped" + exit 1 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_install.sh similarity index 80% rename from deployment/heat/onap-oom/k8s_vm_entrypoint.sh rename to deployment/heat/onap-oom/k8s_vm_install.sh index 62340c11c..3e80f8ea0 100644 --- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/k8s_vm_install.sh @@ -1,5 +1,4 @@ #!/bin/bash -x -# # Copyright 2018 Huawei Technologies Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -8,27 +7,34 @@ # # http://www.apache.org/licenses/LICENSE-2.0 # - export DEBIAN_FRONTEND=noninteractive -HOST_IP=$(hostname -I) -echo $HOST_IP `hostname` >> /etc/hosts +echo "__host_private_ip_addr__ $(hostname)" >> /etc/hosts printenv mkdir -p /opt/config echo "__docker_version__" > /opt/config/docker_version.txt echo "__rancher_ip_addr__" > /opt/config/rancher_ip_addr.txt echo "__rancher_private_ip_addr__" > /opt/config/rancher_private_ip_addr.txt +echo "__host_private_ip_addr__" > /opt/config/host_private_ip_addr.txt +echo "__mtu__" > /opt/config/mtu.txt mkdir -p /etc/docker if [ ! -z "__docker_proxy__" ]; then cat > /etc/docker/daemon.json < /etc/docker/daemon.json < /etc/apt/apt.conf.d/30proxy< /etc/apt/apt.conf.d/30proxy < /dev/null; do done apt-mark hold docker-ce -while [ ! -e /dockerdata-nfs/rancher_agent_cmd.sh ]; do - mount /dockerdata-nfs - sleep 10 -done - -cd ~ -cp /dockerdata-nfs/rancher_agent_cmd.sh . -sed -i "s/docker run/docker run -e CATTLE_HOST_LABELS='__host_label__=true' -e CATTLE_AGENT_IP=${HOST_IP}/g" rancher_agent_cmd.sh -source rancher_agent_cmd.sh -sleep 1m - -reboot +# Enable autorestart when VM reboots +update-rc.d k8s_vm_init_serv defaults diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 689bb6603..e6845cc52 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -96,6 +96,10 @@ parameters: description: Set to "true" if you want to use a RAM disk for /dockerdata-nfs/. default: "false" + mtu: + type: number + default: 1500 + resources: random-str: type: OS::Heat::RandomString @@ -128,6 +132,10 @@ resources: - protocol: tcp port_range_min: 1 port_range_max: 65535 + # Protocols used for vLB/vDNS use case + - protocol: 47 + - protocol: 53 + - protocol: 132 # ONAP management private network @@ -213,6 +221,7 @@ resources: __helm_version__: { get_param: helm_version } __helm_deploy_delay__: { get_param: helm_deploy_delay } __use_ramdisk__: { get_param: use_ramdisk } + __mtu__: { get_param: mtu } __public_net_id__: { get_param: public_net_id } __oam_network_cidr__: { get_param: oam_network_cidr } __oam_network_id__: { get_resource: oam_network } @@ -261,6 +270,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_01_private_port } + k8s_01_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_01_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_01_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_01_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_01_vm_scripts } + k8s_01_vm: type: OS::Nova::Server properties: @@ -271,18 +323,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_01_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_01_vm_config } k8s_02_private_port: type: OS::Neutron::Port @@ -298,6 +340,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_02_private_port } + k8s_02_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_02_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_02_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_02_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_02_vm_scripts } + k8s_02_vm: type: OS::Nova::Server properties: @@ -308,18 +393,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_02_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_02_vm_config } k8s_03_private_port: type: OS::Neutron::Port @@ -335,6 +410,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_03_private_port } + k8s_03_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_03_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_03_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_03_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_03_vm_scripts } + k8s_03_vm: type: OS::Nova::Server properties: @@ -345,18 +463,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_03_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_03_vm_config } k8s_04_private_port: type: OS::Neutron::Port @@ -372,6 +480,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_04_private_port } + k8s_04_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_04_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_04_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_04_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_04_vm_scripts } + k8s_04_vm: type: OS::Nova::Server properties: @@ -382,18 +533,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_04_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_04_vm_config } k8s_05_private_port: type: OS::Neutron::Port @@ -409,6 +550,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_05_private_port } + k8s_05_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_05_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_05_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_05_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_05_vm_scripts } + k8s_05_vm: type: OS::Nova::Server properties: @@ -419,18 +603,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_05_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_05_vm_config } k8s_06_private_port: type: OS::Neutron::Port @@ -446,6 +620,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_06_private_port } + k8s_06_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_06_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_06_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_06_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_06_vm_scripts } + k8s_06_vm: type: OS::Nova::Server properties: @@ -456,18 +673,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_06_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_06_vm_config } k8s_07_private_port: type: OS::Neutron::Port @@ -483,6 +690,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_07_private_port } + k8s_07_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_07_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_07_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_07_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_07_vm_scripts } + k8s_07_vm: type: OS::Nova::Server properties: @@ -493,18 +743,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_07_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_07_vm_config } k8s_08_private_port: type: OS::Neutron::Port @@ -520,6 +760,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_08_private_port } + k8s_08_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_08_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_08_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_08_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_08_vm_scripts } + k8s_08_vm: type: OS::Nova::Server properties: @@ -530,18 +813,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_08_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_08_vm_config } k8s_09_private_port: type: OS::Neutron::Port @@ -557,6 +830,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_09_private_port } + k8s_09_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_09_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_09_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_09_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_09_vm_scripts } + k8s_09_vm: type: OS::Nova::Server properties: @@ -567,18 +883,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_09_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_09_vm_config } k8s_10_private_port: type: OS::Neutron::Port @@ -594,6 +900,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_10_private_port } + k8s_10_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_10_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_10_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_10_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_10_vm_scripts } + k8s_10_vm: type: OS::Nova::Server properties: @@ -604,18 +953,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_10_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_10_vm_config } k8s_11_private_port: type: OS::Neutron::Port @@ -631,6 +970,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_11_private_port } + k8s_11_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_11_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_11_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_11_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_11_vm_scripts } + k8s_11_vm: type: OS::Nova::Server properties: @@ -641,18 +1023,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_11_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_11_vm_config } k8s_12_private_port: type: OS::Neutron::Port @@ -668,6 +1040,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: k8s_12_private_port } + k8s_12_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [k8s_12_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [k8s_12_floating_ip, fixed_ip_address] } + __host_label__: 'compute' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + k8s_12_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: k8s_12_vm_scripts } + k8s_12_vm: type: OS::Nova::Server properties: @@ -678,18 +1093,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: k8s_12_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'compute' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: k8s_12_vm_config } etcd_1_private_port: type: OS::Neutron::Port @@ -705,6 +1110,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: etcd_1_private_port } + etcd_1_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [etcd_1_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [etcd_1_floating_ip, fixed_ip_address] } + __host_label__: 'etcd' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + etcd_1_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: etcd_1_vm_scripts } + etcd_1_vm: type: OS::Nova::Server properties: @@ -715,18 +1163,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: etcd_1_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'etcd' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: etcd_1_vm_config } etcd_2_private_port: type: OS::Neutron::Port @@ -742,6 +1180,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: etcd_2_private_port } + etcd_2_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [etcd_2_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [etcd_2_floating_ip, fixed_ip_address] } + __host_label__: 'etcd' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + etcd_2_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: etcd_2_vm_scripts } + etcd_2_vm: type: OS::Nova::Server properties: @@ -752,18 +1233,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: etcd_2_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'etcd' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: etcd_2_vm_config } etcd_3_private_port: type: OS::Neutron::Port @@ -779,6 +1250,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: etcd_3_private_port } + etcd_3_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [etcd_3_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [etcd_3_floating_ip, fixed_ip_address] } + __host_label__: 'etcd' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + etcd_3_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: etcd_3_vm_scripts } + etcd_3_vm: type: OS::Nova::Server properties: @@ -789,18 +1303,8 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: etcd_3_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'etcd' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: etcd_3_vm_config } orch_1_private_port: type: OS::Neutron::Port @@ -816,6 +1320,49 @@ resources: floating_network_id: { get_param: public_net_id } port_id: { get_resource: orch_1_private_port } + orch_1_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [orch_1_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [orch_1_floating_ip, fixed_ip_address] } + __host_label__: 'orchestration' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + orch_1_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: orch_1_vm_scripts } + orch_1_vm: type: OS::Nova::Server properties: @@ -826,18 +1373,78 @@ resources: key_name: { get_param: key_name } networks: - port: { get_resource: orch_1_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: 'orchestration' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: orch_1_vm_config } + + orch_2_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_network } + fixed_ips: [{"subnet": { get_resource: oam_subnet }}] + security_groups: + - { get_resource: onap_sg } + + orch_2_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: orch_2_private_port } + + orch_2_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [orch_2_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [orch_2_floating_ip, fixed_ip_address] } + __host_label__: 'orchestration' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + orch_2_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: orch_2_vm_scripts } + + orch_2_vm: + type: OS::Nova::Server + properties: + name: + list_join: ['-', [ { get_param: 'OS::stack_name' }, 'orch', '2' ] ] + image: { get_param: ubuntu_1604_image } + flavor: { get_param: orch_vm_flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: orch_2_private_port } + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: orch_2_vm_config } outputs: rancher_vm_ip: diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml index a96c9a373..5f117acb8 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml @@ -93,6 +93,10 @@ parameters: description: Set to "true" if you want to use a RAM disk for /dockerdata-nfs/. default: "false" + mtu: + type: number + default: 1500 + resources: random-str: type: OS::Heat::RandomString @@ -125,6 +129,10 @@ resources: - protocol: tcp port_range_min: 1 port_range_max: 65535 + # Protocols used for vLB/vDNS use case + - protocol: 47 + - protocol: 53 + - protocol: 132 # ONAP management private network diff --git a/deployment/heat/onap-oom/parts/onap-oom-2.yaml b/deployment/heat/onap-oom/parts/onap-oom-2.yaml index ff2272d92..721f3cdc4 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-2.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-2.yaml @@ -12,6 +12,49 @@ floating_network_id: { get_param: public_net_id } port_id: { get_resource: ${VM_TYPE}_${VM_NUM}_private_port } + ${VM_TYPE}_${VM_NUM}_vm_scripts: + type: OS::Heat::CloudConfig + properties: + cloud_config: + power_state: + mode: reboot + runcmd: + - [ /opt/k8s_vm_install.sh ] + write_files: + - path: /opt/k8s_vm_install.sh + permissions: '0755' + content: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + __host_private_ip_addr__: { get_attr: [${VM_TYPE}_${VM_NUM}_floating_ip, fixed_ip_address] } + __mtu__: { get_param: mtu } + template: + get_file: k8s_vm_install.sh + - path: /opt/k8s_vm_init.sh + permissions: '0755' + content: + str_replace: + params: + __host_private_ip_addr__: { get_attr: [${VM_TYPE}_${VM_NUM}_floating_ip, fixed_ip_address] } + __host_label__: '$HOST_LABEL' + template: + get_file: k8s_vm_init.sh + - path: /etc/init.d/k8s_vm_init_serv + permissions: '0755' + content: + get_file: k8s_vm_init_serv.sh + + ${VM_TYPE}_${VM_NUM}_vm_config: + type: OS::Heat::MultipartMime + properties: + parts: + - config: { get_resource: ${VM_TYPE}_${VM_NUM}_vm_scripts } + ${VM_TYPE}_${VM_NUM}_vm: type: OS::Nova::Server properties: @@ -22,16 +65,6 @@ key_name: { get_param: key_name } networks: - port: { get_resource: ${VM_TYPE}_${VM_NUM}_private_port } - user_data_format: RAW - user_data: - str_replace: - params: - __docker_proxy__: { get_param: docker_proxy } - __apt_proxy__: { get_param: apt_proxy } - __docker_version__: { get_param: docker_version } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - __host_label__: '$HOST_LABEL' - template: - get_file: k8s_vm_entrypoint.sh + user_data_format: SOFTWARE_CONFIG + user_data: { get_resource: ${VM_TYPE}_${VM_NUM}_vm_config } diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index aced5dfc6..bd39963de 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -35,6 +35,7 @@ echo "__rancher_agent_version__" > /opt/config/rancher_agent_version.txt echo "__kubectl_version__" > /opt/config/kubectl_version.txt echo "__helm_version__" > /opt/config/helm_version.txt echo "__helm_deploy_delay__" > /opt/config/helm_deploy_delay.txt +echo "__mtu__" > /opt/config/mtu.txt cat < /opt/config/integration-override.yaml __integration_override_yaml__ @@ -50,14 +51,20 @@ sed -i 's/\_\_docker_proxy__/__docker_proxy__/g' /opt/config/integration-overrid cp /opt/config/integration-override.yaml /root cat /root/integration-override.yaml -echo `hostname -I` `hostname` >> /etc/hosts mkdir -p /etc/docker if [ ! -z "__docker_proxy__" ]; then cat > /etc/docker/daemon.json < /etc/docker/daemon.json < /etc/apt/apt.conf.d/30proxy< project.json diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh index 1167496c5..61d5f9f70 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -63,6 +63,7 @@ cat < org.onap.integration version-manifest - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT maven-plugin ONAP Version Manifest and Maven Plugin https://www.onap.org diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv index a8febca45..079dc18a2 100644 --- a/version-manifest/src/main/resources/docker-manifest-staging.csv +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@ -34,6 +34,11 @@ onap/clamp-dashboard-kibana,3.0-STAGING-latest onap/clamp-dashboard-logstash,3.0-STAGING-latest onap/cli,2.0.4 onap/data-router,1.3-STAGING-latest +onap/dcae-be,1.3-STAGING-latest +onap/dcae-dt,1.2-STAGING-latest +onap/dcae-fe,1.3-STAGING-latest +onap/dcae-tools,1.3-STAGING-latest +onap/dcae-tosca-app,1.3-STAGING-latest onap/dmaap/buscontroller,1.0.23 onap/dmaap/datarouter-node,latest onap/dmaap/datarouter-prov,latest @@ -47,19 +52,19 @@ onap/holmes/rule-management,1.2.3-STAGING-latest onap/model-loader,1.3-STAGING-latest onap/msb/msb_apigateway,1.2.2-STAGING-latest onap/msb/msb_discovery,1.2.2-STAGING-latest -onap/multicloud/azure,1.2.1-SNAPSHOT -onap/multicloud/framework,1.2.1-STAGING -onap/multicloud/openstack-newton,1.2.1-STAGING -onap/multicloud/openstack-ocata,1.2.1-STAGING -onap/multicloud/openstack-pike,1.2.1-STAGING -onap/multicloud/openstack-windriver,1.2.1-STAGING -onap/multicloud/vio,1.2.1-STAGING +onap/multicloud/azure,1.2.2-SNAPSHOT +onap/multicloud/framework,1.2.2-STAGING +onap/multicloud/openstack-newton,1.2.2-STAGING +onap/multicloud/openstack-ocata,1.2.2-STAGING +onap/multicloud/openstack-pike,1.2.2-STAGING +onap/multicloud/openstack-windriver,1.2.2-STAGING +onap/multicloud/vio,1.2.2-STAGING onap/multicloud/vio-vesagent,1.0.0 -onap/music/cassandra_3_11,3.0.23 -onap/music/cassandra_job,3.0.23 +onap/music/cassandra_3_11,3.0.24 +onap/music/cassandra_job,3.0.24 onap/music/cassandra_music,3.0.0 -onap/music/music,3.0.23 -onap/music/prom,1.0.5-latest +onap/music/music,3.0.24 +onap/music/prom,1.0.5 onap/network-discovery,latest onap/oom/kube2msb,1.1.0 onap/optf-cmso-dbinit,1.0.1 @@ -85,28 +90,28 @@ onap/org.onap.dcaegen2.platform.policy-handler,4.4.0 onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.5 onap/org.onap.dcaegen2.services.prh.prh-app-server,1.1.1 onap/policy-apex-pdp,2.0-SNAPSHOT-latest -onap/policy-distribution,2.0.2-SNAPSHOT-latest +onap/policy-distribution,2.0.3-SNAPSHOT-latest onap/policy-drools,1.3-SNAPSHOT-latest onap/policy-pe,1.3-SNAPSHOT-latest -onap/pomba-aai-context-builder,1.3.2-SNAPSHOT-latest -onap/pomba-context-aggregator,1.3.4-SNAPSHOT-latest -onap/pomba-network-discovery-context-builder,1.3.1-SNAPSHOT-latest -onap/pomba-sdc-context-builder,1.3.2-SNAPSHOT-latest +onap/pomba-aai-context-builder,1.3.3-SNAPSHOT-latest +onap/pomba-context-aggregator,1.3.5-SNAPSHOT-latest +onap/pomba-network-discovery-context-builder,1.3.2-SNAPSHOT-latest +onap/pomba-sdc-context-builder,1.3.3-SNAPSHOT-latest onap/portal-app,2.3.1 onap/portal-db,2.3.1 onap/portal-sdk,2.3.1 onap/portal-wms,2.3.1 onap/rproxy,2.1-STAGING-latest -onap/sdc-backend,1.3-STAGING-latest -onap/sdc-backend-init,1.3-STAGING-latest -onap/sdc-cassandra,1.3-STAGING-latest -onap/sdc-cassandra-init,1.3-STAGING-latest -onap/sdc-elasticsearch,1.3-STAGING-latest -onap/sdc-frontend,1.3-STAGING-latest -onap/sdc-init-elasticsearch,1.3-STAGING-latest -onap/sdc-kibana,1.3-STAGING-latest -onap/sdc-onboard-backend,1.3-STAGING-latest -onap/sdc-onboard-cassandra-init,1.3-STAGING-latest +onap/sdc-backend,1.4-STAGING-latest +onap/sdc-backend-init,1.4-STAGING-latest +onap/sdc-cassandra,1.4-STAGING-latest +onap/sdc-cassandra-init,1.4-STAGING-latest +onap/sdc-elasticsearch,1.4-STAGING-latest +onap/sdc-frontend,1.4-STAGING-latest +onap/sdc-init-elasticsearch,1.4-STAGING-latest +onap/sdc-kibana,1.4-STAGING-latest +onap/sdc-onboard-backend,1.4-STAGING-latest +onap/sdc-onboard-cassandra-init,1.4-STAGING-latest onap/sdnc-ansible-server-image,1.4-STAGING-latest onap/sdnc-dmaap-listener-image,1.4-STAGING-latest onap/sdnc-image,1.4-STAGING-latest @@ -127,27 +132,27 @@ onap/sparky-be,1.3-STAGING-latest onap/spike,1.0-STAGING-latest onap/testsuite,1.3.1-STAGING-latest onap/tproxy-config,2.1-STAGING-latest -onap/usecase-ui,1.2.1-STAGING-latest -onap/usecase-ui-server,1.2.0-STAGING-latest +onap/usecase-ui,1.2.2-STAGING-latest +onap/usecase-ui-server,1.2.1-STAGING-latest onap/validation,1.3-STAGING-latest -onap/vfc/catalog,1.2.0-STAGING-latest -onap/vfc/db,1.2.0-STAGING-latest -onap/vfc/emsdriver,1.2.0-STAGING-latest -onap/vfc/gvnfmdriver,1.2.0-STAGING-latest -onap/vfc/jujudriver,1.2.0-STAGING-latest -onap/vfc/multivimproxy,1.2.0-STAGING-latest -onap/vfc/nfvo/svnfm/huawei,1.2.0-STAGING-latest +onap/vfc/catalog,1.2.1-STAGING-latest +onap/vfc/db,1.2.1-STAGING-latest +onap/vfc/emsdriver,1.2.1-STAGING-latest +onap/vfc/gvnfmdriver,1.2.1-STAGING-latest +onap/vfc/jujudriver,1.2.1-STAGING-latest +onap/vfc/multivimproxy,1.2.1-STAGING-latest +onap/vfc/nfvo/svnfm/huawei,1.2.1-STAGING-latest onap/vfc/nfvo/svnfm/nokia,1.1.0-STAGING-latest -onap/vfc/nfvo/svnfm/nokiav2,1.3.0-STAGING-latest -onap/vfc/nslcm,1.2.0-STAGING-latest -onap/vfc/resmanagement,1.2.0-STAGING-latest -onap/vfc/vnflcm,1.2.0-STAGING-latest -onap/vfc/vnfmgr,1.2.0-STAGING-latest -onap/vfc/vnfres,1.2.0-STAGING-latest +onap/vfc/nfvo/svnfm/nokiav2,1.3.1-STAGING-latest +onap/vfc/nslcm,1.2.1-STAGING-latest +onap/vfc/resmanagement,1.2.1-STAGING-latest +onap/vfc/vnflcm,1.2.1-STAGING-latest +onap/vfc/vnfmgr,1.2.1-STAGING-latest +onap/vfc/vnfres,1.2.1-STAGING-latest onap/vfc/wfengine-activiti,1.2.0-STAGING-latest onap/vfc/wfengine-mgrservice,1.2.0-STAGING-latest onap/vfc/ztesdncdriver,1.2.0-STAGING-latest -onap/vfc/ztevnfmdriver,1.2.0 +onap/vfc/ztevnfmdriver,1.2.1-STAGING-latest onap/vid,3.2-STAGING-latest onap/vnfsdk/ice,1.1.0 onap/vnfsdk/refrepo,1.2.0 diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 281c1845c..534105578 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -1,13 +1,13 @@ image,tag -onap/aaf/aaf_agent,2.1.7 -onap/aaf/aaf_cm,2.1.7 -onap/aaf/aaf_config,2.1.7 -onap/aaf/aaf_fs,2.1.7 -onap/aaf/aaf_gui,2.1.7 -onap/aaf/aaf_hello,2.1.7 -onap/aaf/aaf_locate,2.1.7 -onap/aaf/aaf_oauth,2.1.7 -onap/aaf/aaf_service,2.1.7 +onap/aaf/aaf_agent,2.1.8 +onap/aaf/aaf_cm,2.1.8 +onap/aaf/aaf_config,2.1.8 +onap/aaf/aaf_fs,2.1.8 +onap/aaf/aaf_gui,2.1.8 +onap/aaf/aaf_hello,2.1.8 +onap/aaf/aaf_locate,2.1.8 +onap/aaf/aaf_oauth,2.1.8 +onap/aaf/aaf_service,2.1.8 onap/aaf/abrmd,3.0.0 onap/aaf/distcenter,3.0.0 onap/aaf/sms,3.0.1 @@ -15,25 +15,29 @@ onap/aaf/smsquorumclient,3.0.1 onap/aaf/testcaservice,3.0.0 onap/aai-cacher,1.0.0 onap/aai-graphadmin,1.0.0 -onap/aai-resources,1.3.1 -onap/aai-traversal,1.3.1 +onap/aai-resources,1.3.3 +onap/aai-traversal,1.3.2 onap/aai/esr-gui,1.2.1 onap/aai/esr-server,1.2.1 onap/admportal-sdnc-image,1.4.1 onap/appc-cdt-image,1.4.0 onap/appc-image,1.4.0 -onap/babel,1.3.0 +onap/babel,1.3.2 onap/ccsdk-ansible-server-image,0.3.1 onap/ccsdk-apps-ms-neng,0.3.1 onap/ccsdk-dgbuilder-image,0.3.1 onap/ccsdk-odl-oxygen-image,0.3.1 onap/ccsdk-odlsli-image,0.3.1 onap/champ,1.3.0 -onap/clamp,3.0.2 -onap/clamp-dashboard-kibana,3.0.2 -onap/clamp-dashboard-logstash,3.0.2 +onap/clamp,3.0.3 +onap/clamp-dashboard-kibana,3.0.3 +onap/clamp-dashboard-logstash,3.0.3 onap/cli,2.0.4 onap/data-router,1.3.0 +onap/dcae-be,1.3.0 +onap/dcae-dt,1.2.0 +onap/dcae-fe,1.3.0 +onap/dcae-tosca-app,1.3.0 onap/dmaap/buscontroller,1.0.23 onap/dmaap/datarouter-node,1.0.3 onap/dmaap/datarouter-prov,1.0.3 @@ -43,20 +47,22 @@ onap/externalapi/nbi,3.0.1 onap/gizmo,1.3.0 onap/holmes/engine-management,1.2.2 onap/holmes/rule-management,1.2.3 -onap/model-loader,1.3.0 +onap/model-loader,1.3.1 onap/msb/msb_apigateway,1.2.1 onap/msb/msb_discovery,1.2.1 -onap/multicloud/azure,1.2.0 -onap/multicloud/framework,1.2.0 -onap/multicloud/openstack-newton,1.2.0 -onap/multicloud/openstack-ocata,1.2.0 -onap/multicloud/openstack-pike,1.2.0 -onap/multicloud/openstack-windriver,1.2.0 -onap/multicloud/vio,1.2.0 +onap/multicloud/azure,1.2.1 +onap/multicloud/framework,1.2.1 +onap/multicloud/openstack-newton,1.2.1 +onap/multicloud/openstack-ocata,1.2.1 +onap/multicloud/openstack-pike,1.2.1 +onap/multicloud/openstack-windriver,1.2.1 +onap/multicloud/vio,1.2.1 onap/multicloud/vio-vesagent,1.0.0 -onap/music/cassandra_3_11,3.0.23 -onap/music/cassandra_job,3.0.23 -onap/music/music,3.0.23 +onap/music/cassandra_3_11,3.0.24 +onap/music/cassandra_job,3.0.24 +onap/music/cassandra_music,3.0.0 +onap/music/music,3.0.24 +onap/music/prom,1.0.5 onap/oom/kube2msb,1.1.0 onap/optf-cmso-dbinit,1.0.1 onap/optf-cmso-service,1.0.1 @@ -81,27 +87,27 @@ onap/org.onap.dcaegen2.platform.policy-handler,4.4.0 onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.5 onap/org.onap.dcaegen2.services.prh.prh-app-server,1.1.1 onap/policy-apex-pdp,2.0.3 -onap/policy-distribution,2.0.2 -onap/policy-drools,1.3.3 -onap/policy-pe,1.3.3 -onap/pomba-aai-context-builder,1.3.1 -onap/pomba-context-aggregator,1.3.3 -onap/pomba-network-discovery-context-builder,1.3.0 -onap/pomba-sdc-context-builder,1.3.1 +onap/policy-distribution,2.0.3 +onap/policy-drools,1.3.4 +onap/policy-pe,1.3.4 +onap/pomba-aai-context-builder,1.3.2 +onap/pomba-context-aggregator,1.3.4 +onap/pomba-network-discovery-context-builder,1.3.1 +onap/pomba-sdc-context-builder,1.3.2 onap/portal-app,2.3.1 onap/portal-db,2.3.1 onap/portal-sdk,2.3.1 onap/portal-wms,2.3.1 -onap/sdc-backend,1.3.2 -onap/sdc-backend-init,1.3.2 -onap/sdc-cassandra,1.3.2 -onap/sdc-cassandra-init,1.3.2 -onap/sdc-elasticsearch,1.3.2 -onap/sdc-frontend,1.3.2 -onap/sdc-init-elasticsearch,1.3.2 -onap/sdc-kibana,1.3.2 -onap/sdc-onboard-backend,1.3.2 -onap/sdc-onboard-cassandra-init,1.3.2 +onap/sdc-backend,1.3.3 +onap/sdc-backend-init,1.3.3 +onap/sdc-cassandra,1.3.3 +onap/sdc-cassandra-init,1.3.3 +onap/sdc-elasticsearch,1.3.3 +onap/sdc-frontend,1.3.3 +onap/sdc-init-elasticsearch,1.3.3 +onap/sdc-kibana,1.3.3 +onap/sdc-onboard-backend,1.3.3 +onap/sdc-onboard-cassandra-init,1.3.3 onap/sdnc-ansible-server-image,1.4.1 onap/sdnc-dmaap-listener-image,1.4.1 onap/sdnc-image,1.4.1 @@ -118,27 +124,28 @@ onap/so/sdnc-adapter,1.3.1 onap/so/so-monitoring,1.3.1 onap/so/vfc-adapter,1.3.1 onap/sparky-be,1.3.0 -onap/usecase-ui,1.2.1 -onap/usecase-ui-server,1.2.0 -onap/validation,1.3.0 -onap/vfc/catalog,1.2.0 -onap/vfc/db,1.2.0 -onap/vfc/emsdriver,1.2.0 -onap/vfc/gvnfmdriver,1.2.0 -onap/vfc/jujudriver,1.2.0 -onap/vfc/multivimproxy,1.2.0 -onap/vfc/nfvo/svnfm/huawei,1.2.0 +onap/testsuite,1.3.1 +onap/usecase-ui,1.2.2 +onap/usecase-ui-server,1.2.1 +onap/validation,1.3.1 +onap/vfc/catalog,1.2.1 +onap/vfc/db,1.2.1 +onap/vfc/emsdriver,1.2.1 +onap/vfc/gvnfmdriver,1.2.1 +onap/vfc/jujudriver,1.2.1 +onap/vfc/multivimproxy,1.2.1 +onap/vfc/nfvo/svnfm/huawei,1.2.1 onap/vfc/nfvo/svnfm/nokia,1.1.0 onap/vfc/nfvo/svnfm/nokiav2,1.3.0 -onap/vfc/nslcm,1.2.0 -onap/vfc/resmanagement,1.2.0 -onap/vfc/vnflcm,1.2.0 -onap/vfc/vnfmgr,1.2.0 -onap/vfc/vnfres,1.2.0 +onap/vfc/nslcm,1.2.1 +onap/vfc/resmanagement,1.2.1 +onap/vfc/vnflcm,1.2.1 +onap/vfc/vnfmgr,1.2.1 +onap/vfc/vnfres,1.2.1 onap/vfc/wfengine-activiti,1.2.0 onap/vfc/wfengine-mgrservice,1.2.0 onap/vfc/ztesdncdriver,1.2.0 -onap/vfc/ztevnfmdriver,1.2.0 +onap/vfc/ztevnfmdriver,1.2.1 onap/vid,3.2.0 onap/vnfsdk/ice,1.1.0 onap/vnfsdk/refrepo,1.2.0 @@ -152,6 +159,6 @@ onap/vvp/jenkins,1.0.0 onap/vvp/portal,1.0.0 onap/vvp/postgresql,1.0.0 onap/vvp/test-engine,1.0.0 -onap/workflow-backend,1.3.1 -onap/workflow-frontend,1.3.1 -onap/workflow-init,1.3.1 +onap/workflow-backend,1.3.2 +onap/workflow-frontend,1.3.2 +onap/workflow-init,1.3.2 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index deaaaf1f7..5ed838b4d 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -1,28 +1,28 @@ groupId,artifactId,version -org.onap.aaf.authz,aaf-auth-batch,2.1.7 -org.onap.aaf.authz,aaf-auth-cass,2.1.7 -org.onap.aaf.authz,aaf-auth-certman,2.1.7 -org.onap.aaf.authz,aaf-auth-client,2.1.7 -org.onap.aaf.authz,aaf-auth-cmd,2.1.7 -org.onap.aaf.authz,aaf-auth-core,2.1.7 -org.onap.aaf.authz,aaf-auth-deforg,2.1.7 -org.onap.aaf.authz,aaf-auth-fs,2.1.7 -org.onap.aaf.authz,aaf-auth-gui,2.1.7 -org.onap.aaf.authz,aaf-auth-hello,2.1.7 -org.onap.aaf.authz,aaf-auth-locate,2.1.7 -org.onap.aaf.authz,aaf-auth-oauth,2.1.7 -org.onap.aaf.authz,aaf-auth-service,2.1.7 -org.onap.aaf.authz,aaf-cadi-aaf,2.1.7 -org.onap.aaf.authz,aaf-cadi-cass,2.1.7 -org.onap.aaf.authz,aaf-cadi-client,2.1.7 -org.onap.aaf.authz,aaf-cadi-core,2.1.7 -org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.7 -org.onap.aaf.authz,aaf-cadi-shiro,2.1.2 -org.onap.aaf.authz,aaf-misc-env,2.1.7 -org.onap.aaf.authz,aaf-misc-log4j,2.1.7 -org.onap.aaf.authz,aaf-misc-rosetta,2.1.7 -org.onap.aaf.authz,aaf-misc-xgen,2.1.7 -org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.2 +org.onap.aaf.authz,aaf-auth-batch,2.1.8 +org.onap.aaf.authz,aaf-auth-cass,2.1.8 +org.onap.aaf.authz,aaf-auth-certman,2.1.8 +org.onap.aaf.authz,aaf-auth-client,2.1.8 +org.onap.aaf.authz,aaf-auth-cmd,2.1.8 +org.onap.aaf.authz,aaf-auth-core,2.1.8 +org.onap.aaf.authz,aaf-auth-deforg,2.1.8 +org.onap.aaf.authz,aaf-auth-fs,2.1.8 +org.onap.aaf.authz,aaf-auth-gui,2.1.8 +org.onap.aaf.authz,aaf-auth-hello,2.1.8 +org.onap.aaf.authz,aaf-auth-locate,2.1.8 +org.onap.aaf.authz,aaf-auth-oauth,2.1.8 +org.onap.aaf.authz,aaf-auth-service,2.1.8 +org.onap.aaf.authz,aaf-cadi-aaf,2.1.8 +org.onap.aaf.authz,aaf-cadi-cass,2.1.8 +org.onap.aaf.authz,aaf-cadi-client,2.1.8 +org.onap.aaf.authz,aaf-cadi-core,2.1.8 +org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.8 +org.onap.aaf.authz,aaf-cadi-shiro,2.1.8 +org.onap.aaf.authz,aaf-misc-env,2.1.8 +org.onap.aaf.authz,aaf-misc-log4j,2.1.8 +org.onap.aaf.authz,aaf-misc-rosetta,2.1.8 +org.onap.aaf.authz,aaf-misc-xgen,2.1.8 +org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.8 org.onap.aai,rest-client,1.3.0 org.onap.aai,search-data-service,1.3.1 org.onap.aai.aai-common,aai-annotations,1.3.0 @@ -31,7 +31,7 @@ org.onap.aai.aai-common,aai-common,1.3.0 org.onap.aai.aai-common,aai-core,1.3.0 org.onap.aai.aai-common,aai-schema,1.3.0 org.onap.aai.aai-common,aai-utils,1.3.0 -org.onap.aai.babel,babel,1.3.0 +org.onap.aai.babel,babel,1.3.2 org.onap.aai.cacher,cacher,1.0.0 org.onap.aai.champ,champ,1.3.0 org.onap.aai.data-router,data-router,1.3.0 @@ -53,15 +53,15 @@ org.onap.aai.logging-service,common-logging,1.3.0 org.onap.aai.logging-service,eelf-logging,1.3.0 org.onap.aai.logging-service,logging-api,1.3.0 org.onap.aai.logging-service,logging-service,1.3.0 -org.onap.aai.model-loader,model-loader,1.3.0 -org.onap.aai.resources,aai-resources,1.3.1 -org.onap.aai.resources,resources,1.3.1 +org.onap.aai.model-loader,model-loader,1.3.1 +org.onap.aai.resources,aai-resources,1.3.3 +org.onap.aai.resources,resources,1.3.3 org.onap.aai.router-core,router-core,1.3.0 org.onap.aai.sparky-be,sparky-be,1.3.0 org.onap.aai.sparky-fe,sparky-fe,1.3.0 -org.onap.aai.traversal,aai-traversal,1.3.1 -org.onap.aai.traversal,traversal,1.3.1 -org.onap.aai.validation,validation,1.3.0 +org.onap.aai.traversal,aai-traversal,1.3.2 +org.onap.aai.traversal,traversal,1.3.2 +org.onap.aai.validation,validation,1.3.1 org.onap.appc,appc-aai-client-provider,1.4.0 org.onap.appc,appc-ansible-adapter-bundle,1.4.0 org.onap.appc,appc-artifact-handler-provider,1.4.0 @@ -155,7 +155,7 @@ org.onap.ccsdk.sli.plugins,properties-node-provider,0.3.1 org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.3.1 org.onap.ccsdk.storage.pgaas,pgaas,1.0.0 org.onap.ccsdk.utils,utils,1.0.0 -org.onap.clamp.clds.clamp,clamp,3.0.2 +org.onap.clamp.clds.clamp,clamp,3.0.3 org.onap.cli,cli-framework,2.0.4 org.onap.cli,cli-main,2.0.4 org.onap.cli,cli-plugins-sample,2.0.4 @@ -216,21 +216,21 @@ org.onap.modeling.toscaparsers,kwalify,1.0.0 org.onap.modeling.toscaparsers.nfvparser,modeling-toscaparsers-nfvparser,1.0.0 org.onap.msb.java-sdk,msb-java-sdk,1.1.1 org.onap.msb.swagger-sdk,swagger-sdk,1.1.0 -org.onap.multicloud.azure,multicloud-azure,1.2.0 -org.onap.multicloud.framework,multivimbroker,1.2.0 -org.onap.multicloud.openstack,newton,1.2.0 -org.onap.multicloud.openstack,ocata,1.2.0 -org.onap.multicloud.openstack,windriver,1.2.0 +org.onap.multicloud.azure,multicloud-azure,1.2.1 +org.onap.multicloud.framework,multivimbroker,1.2.1 +org.onap.multicloud.openstack,newton,1.2.1 +org.onap.multicloud.openstack,ocata,1.2.1 +org.onap.multicloud.openstack,windriver,1.2.1 org.onap.multicloud.openstack.vmware,vesagent,1.0.0 -org.onap.multicloud.openstack.vmware,vio,1.2.0 +org.onap.multicloud.openstack.vmware,vio,1.2.1 org.onap.music,MUSIC,3.0.23 -org.onap.oparent,oparent,1.2.1 +org.onap.oparent,oparent,1.2.2 org.onap.policy.apex-pdp,apex-pdp,2.0.3 org.onap.policy.common,common-modules,1.3.3 -org.onap.policy.distribution,distribution,2.0.2 -org.onap.policy.drools-applications,drools-pdp-apps,1.3.3 -org.onap.policy.drools-pdp,drools-pdp,1.3.3 -org.onap.policy.engine,PolicyEngineSuite,1.3.3 +org.onap.policy.distribution,distribution,2.0.3 +org.onap.policy.drools-applications,drools-pdp-apps,1.3.4 +org.onap.policy.drools-pdp,drools-pdp,1.3.4 +org.onap.policy.engine,PolicyEngineSuite,1.3.4 org.onap.policy.parent,parent,2.0.1 org.onap.portal.sdk,epsdk-analytics,2.4.0 org.onap.portal.sdk,epsdk-app-common,2.4.0 @@ -245,24 +245,23 @@ org.onap.sdc.sdc-tosca,sdc-tosca,1.4.6 org.onap.sdnc.northbound,generic-resource-api.provider,1.4.1 org.onap.sdnc.northbound,vnfapi-provider,1.4.1 org.onap.sdnc.northbound,vnftools-provider,1.4.1 -org.onap.usecase-ui.server,usecase-ui-server,1.2.0 -org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.2.0 -org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.2.0 -org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.2.0 -org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.2.0 -org.onap.vfc.nfvo.db,vfc-nfvo-db,1.2.0 -org.onap.vfc.nfvo.driver.ems.ems,emsdriver-standalone,1.2.0 +org.onap.usecase-ui.server,usecase-ui-server,1.2.1 +org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.2.1 +org.onap.vfc.gvnfm.vnfmgr.mgr,vfc-gvnfm-vnfmgr-mgr,1.2.1 +org.onap.vfc.gvnfm.vnfres.res,vfc-gvnfm-vnfres-res,1.2.1 +org.onap.vfc.nfvo.catalog,vfc-nfvo-catalog,1.2.1 +org.onap.vfc.nfvo.db,vfc-nfvo-db,1.2.1 +org.onap.vfc.nfvo.driver.ems.ems,emsdriver-standalone,1.2.1 org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone,vfc-nfvo-driver-sfc-zte-sfc-driver,1.2.0 -org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.2.0 +org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter,vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter,1.2.1 org.onap.vfc.nfvo.driver.vnfm.svnfm,vfcadaptor-deployment,1.1.0 -org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.2.0 -org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2,driverwar,1.3.0 -org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.2.0 -org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.2.0 -org.onap.vfc.nfvo.multivimproxy,vfc-nfvo-multivimproxy-deployment,1.2.0 -org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.2.0 +org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter,hw-vnfmadapter-deployment,1.2.1 +org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2,driverwar,1.2.1 +org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager,vfc-nfvo-driver-vnfm-svnfm-zte-vmanager,1.2.1 +org.onap.vfc.nfvo.lcm,vfc-nfvo-lcm,1.2.1 +org.onap.vfc.nfvo.multivimproxy,vfc-nfvo-multivimproxy-deployment,1.2.1 +org.onap.vfc.nfvo.resmanagement,vfc-nfvo-resmanagement-deployment,1.2.1 org.onap.vfc.nfvo.wfengine,activiti-extension,1.2.0 -org.onap.vfc.nfvo.wfengine,workflow-engine-mgr-service,1.2.0 org.onap.vnfsdk.refrepo,vnf-sdk-marketplace,1.1.2 org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-core-parent,1.2.0 org.onap.vnfsdk.refrepo,vnf-sdk-marketplace-deployment,1.2.0 diff --git a/version.properties b/version.properties index ddc6dd849..50547ff5c 100644 --- a/version.properties +++ b/version.properties @@ -3,7 +3,7 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major_version=3 +major_version=4 minor_version=0 patch_version=0