Increase k8s VMs to 9

Change-Id: I0fb58dc5a41b93b680ee39020ef01b24170b5c46
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

2 files changed, 83 insertions, 1 deletions

diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index c290e17cd..736dd1837 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -146,6 +146,8 @@ resources:
               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],
             ]
   k8s_1_private_port:
     type: OS::Neutron::Port
@@ -378,6 +380,72 @@ resources:
           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: onap_key
+      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] }
+          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: onap_key
+      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] }
+          template:
+            get_file: k8s_vm_entrypoint.sh
+
 outputs:
   rancher_vm_ip:
     description: The IP address of the rancher instance
@@ -411,3 +479,11 @@ outputs:
     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] }
+
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 19e7b60b1..41d511391 100755
--- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
+++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
@@ -1,6 +1,12 @@
 #!/bin/bash
 
-NUM_K8S_VMS=7
+if [ "$#" -ne 1 ]; then
+    echo This script generates the HEAT template for X number of k8s VMs
+    echo "$0 <num k8s vms>"
+    exit 1
+fi
+NUM_K8S_VMS=$1
+
 
 if [ -z "$WORKSPACE" ]; then
     export WORKSPACE=`git rev-parse --show-toplevel`