diff options
Diffstat (limited to 'deployment/heat/onap-oom')
| -rw-r--r-- | deployment/heat/onap-oom/env/gwu/onap-oom.env | 2 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/env/tlab/onap-oom.env | 2 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/env/windriver/onap-oom.env | 2 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 240 |
4 files changed, 3 insertions, 243 deletions
diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env index 3cb9e1834..cca6c0fbf 100644 --- a/deployment/heat/onap-oom/env/gwu/onap-oom.env +++ b/deployment/heat/onap-oom/env/gwu/onap-oom.env @@ -6,7 +6,7 @@ parameters: docker_proxy: 192.168.2.18:5000 rancher_vm_flavor: c1.xlarge - k8s_vm_flavor: c1.xlarge + k8s_vm_flavor: c1.2xlarge public_net_id: c3352d4c-8452-4172-b09c-15f017673708 key_name: onap-key diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env index 29404190e..fa7cab767 100644 --- a/deployment/heat/onap-oom/env/tlab/onap-oom.env +++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env @@ -6,7 +6,7 @@ parameters: docker_proxy: 192.168.31.204:5000 rancher_vm_flavor: m4.xlarge - k8s_vm_flavor: m4.xlarge + k8s_vm_flavor: m5.xlarge public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9 diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env index 15ca052fa..c9cc2ba04 100644 --- a/deployment/heat/onap-oom/env/windriver/onap-oom.env +++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env @@ -6,7 +6,7 @@ parameters: docker_proxy: 10.12.5.2:5000 rancher_vm_flavor: m1.xlarge - k8s_vm_flavor: m1.xlarge + k8s_vm_flavor: m2.xlarge public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index c378d0a50..867f242d9 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -167,12 +167,6 @@ resources: get_attr: [k8s_3_floating_ip, floating_ip_address], get_attr: [k8s_4_floating_ip, floating_ip_address], get_attr: [k8s_5_floating_ip, floating_ip_address], - get_attr: [k8s_6_floating_ip, floating_ip_address], - 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_private_ips__: [ get_attr: [k8s_1_floating_ip, fixed_ip_address], @@ -180,12 +174,6 @@ resources: get_attr: [k8s_3_floating_ip, fixed_ip_address], get_attr: [k8s_4_floating_ip, fixed_ip_address], get_attr: [k8s_5_floating_ip, fixed_ip_address], - get_attr: [k8s_6_floating_ip, fixed_ip_address], - get_attr: [k8s_7_floating_ip, fixed_ip_address], - get_attr: [k8s_8_floating_ip, fixed_ip_address], - get_attr: [k8s_9_floating_ip, fixed_ip_address], - get_attr: [k8s_10_floating_ip, fixed_ip_address], - get_attr: [k8s_11_floating_ip, fixed_ip_address], ] k8s_1_private_port: type: OS::Neutron::Port @@ -357,210 +345,6 @@ resources: template: get_file: k8s_vm_entrypoint.sh - k8s_6_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_6_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network_id: { get_param: public_net_id } - port_id: { get_resource: k8s_6_private_port } - - k8s_6_vm: - type: OS::Nova::Server - properties: - name: k8s_6 - image: { get_param: ubuntu_1604_image } - flavor: { get_param: k8s_vm_flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: k8s_6_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] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - template: - get_file: k8s_vm_entrypoint.sh - - k8s_7_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_7_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network_id: { get_param: public_net_id } - port_id: { get_resource: k8s_7_private_port } - - k8s_7_vm: - type: OS::Nova::Server - properties: - name: k8s_7 - image: { get_param: ubuntu_1604_image } - flavor: { get_param: k8s_vm_flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: k8s_7_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] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - template: - get_file: k8s_vm_entrypoint.sh - - k8s_8_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_8_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network_id: { get_param: public_net_id } - port_id: { get_resource: k8s_8_private_port } - - k8s_8_vm: - type: OS::Nova::Server - properties: - name: k8s_8 - image: { get_param: ubuntu_1604_image } - flavor: { get_param: k8s_vm_flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: k8s_8_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] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - template: - get_file: k8s_vm_entrypoint.sh - - k8s_9_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_9_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network_id: { get_param: public_net_id } - port_id: { get_resource: k8s_9_private_port } - - k8s_9_vm: - type: OS::Nova::Server - properties: - name: k8s_9 - image: { get_param: ubuntu_1604_image } - flavor: { get_param: k8s_vm_flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: k8s_9_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] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - 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: { 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 } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_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: { 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 } - __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } - __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } - template: - get_file: k8s_vm_entrypoint.sh - outputs: rancher_vm_ip: description: The IP address of the rancher instance @@ -586,27 +370,3 @@ outputs: description: The IP address of the k8s_5 instance value: { get_attr: [k8s_5_floating_ip, floating_ip_address] } - k8s_6_vm_ip: - description: The IP address of the k8s_6 instance - value: { get_attr: [k8s_6_floating_ip, floating_ip_address] } - - k8s_7_vm_ip: - description: The IP address of the k8s_7 instance - value: { get_attr: [k8s_7_floating_ip, floating_ip_address] } - - k8s_8_vm_ip: - description: The IP address of the k8s_8 instance - value: { get_attr: [k8s_8_floating_ip, floating_ip_address] } - - k8s_9_vm_ip: - 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] } - |