diff options
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 76 | ||||
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh | 1 | ||||
| -rw-r--r-- | version-manifest/src/main/resources/docker-manifest.csv | 15 |
3 files changed, 83 insertions, 9 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 9cf44e41c..1a217c221 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -149,6 +149,8 @@ resources: get_attr: [k8s_7_floating_ip, floating_ip_address], get_attr: [k8s_8_floating_ip, floating_ip_address], get_attr: [k8s_9_floating_ip, floating_ip_address], + get_attr: [k8s_10_floating_ip, floating_ip_address], + get_attr: [k8s_11_floating_ip, floating_ip_address], ] k8s_1_private_port: type: OS::Neutron::Port @@ -447,6 +449,72 @@ resources: template: get_file: k8s_vm_entrypoint.sh + k8s_10_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 } + + k8s_10_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: k8s_10_private_port } + + k8s_10_vm: + type: OS::Nova::Server + properties: + name: k8s_10 + image: { get_param: ubuntu_1604_image } + flavor: { get_param: k8s_vm_flavor } + key_name: onap_key + 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 } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + template: + get_file: k8s_vm_entrypoint.sh + + k8s_11_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 } + + k8s_11_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: k8s_11_private_port } + + k8s_11_vm: + type: OS::Nova::Server + properties: + name: k8s_11 + image: { get_param: ubuntu_1604_image } + flavor: { get_param: k8s_vm_flavor } + key_name: onap_key + 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 } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + template: + get_file: k8s_vm_entrypoint.sh + outputs: rancher_vm_ip: description: The IP address of the rancher instance @@ -488,3 +556,11 @@ outputs: description: The IP address of the k8s_9 instance value: { get_attr: [k8s_9_floating_ip, floating_ip_address] } + k8s_10_vm_ip: + description: The IP address of the k8s_10 instance + value: { get_attr: [k8s_10_floating_ip, floating_ip_address] } + + k8s_11_vm_ip: + description: The IP address of the k8s_11 instance + value: { get_attr: [k8s_11_floating_ip, floating_ip_address] } + 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 1ab0de762..23f969c6b 100755 --- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh +++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh @@ -52,6 +52,7 @@ cat <<EOF __integration_override_yaml__: { get_param: integration_override_yaml } __oam_network_id__: { get_resource: oam_network } __oam_subnet_id__: { get_resource: oam_subnet } + __k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] } __k8s_vm_ips__: [ EOF diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 259dd9f19..de1c0059d 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -10,8 +10,8 @@ onap/aaf/sms,latest onap/aaf/smsquorumclient,latest onap/aai-resources,1.2.2 onap/aai-traversal,1.2.2 -onap/aai/esr-gui,latest -onap/aai/esr-server,latest +onap/aai/esr-gui,1.1.0 +onap/aai/esr-server,1.1.0 onap/admportal-sdnc-image,1.3.4 onap/appc-cdt-image,1.3.0 onap/appc-image,1.3.0 @@ -30,7 +30,6 @@ onap/gizmo,1.2.1 onap/holmes/engine-management,1.1.0 onap/holmes/rule-management,1.1.0 onap/model-loader,1.2.1 -onap/modeling/javatoscachecker,latest onap/msb/msb_apigateway,1.1.0 onap/msb/msb_discovery,1.1.0 onap/multicloud/framework,1.1.2 @@ -58,14 +57,12 @@ onap/org.onap.dcaegen2.platform.deployment-handler,2.1.5 onap/org.onap.dcaegen2.platform.inventory-api,3.0.1 onap/org.onap.dcaegen2.platform.policy-handler,2.4.5 onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.4 -onap/org.onap.dcaegen2.services.heartbeat,latest -onap/org.onap.dcaegen2.services.prh.prh-app-server,latest onap/policy-drools,1.2.3 onap/policy-pe,1.2.3 -onap/portal-app,v2.2.0 -onap/portal-db,v2.2.0 -onap/portal-sdk,v2.2.0 -onap/portal-wms,v2.2.0 +onap/portal-app,2.2.0 +onap/portal-db,2.2.0 +onap/portal-sdk,2.2.0 +onap/portal-wms,2.2.0 onap/sdc-api-tests,1.2.0 onap/sdc-backend,1.2.0 onap/sdc-backend-init,1.2.0 |