From 6e6620174c1f788bd4d6153a2a34c33fb4f83c8d Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Tue, 13 Nov 2018 18:41:45 -0800
Subject: Reduce sizes of etcd and orch VMs

Reduce sizes of etcd and orch VMs.  Also add one more
orch VM for resilience.

Change-Id: I8947e0fb6af7e788146e6a67f165b9dbc879dcf6
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 deployment/heat/onap-oom/env/tlab/onap-oom.env     |  4 +--
 .../heat/onap-oom/env/windriver/onap-oom.env       |  4 +--
 deployment/heat/onap-oom/onap-oom.yaml             | 37 ++++++++++++++++++++++
 .../heat/onap-oom/scripts/gen-onap-oom-yaml.sh     |  2 +-
 4 files changed, 42 insertions(+), 5 deletions(-)

(limited to 'deployment/heat/onap-oom')

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index 039f128d4..554ad2ac8 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
 
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index e69005e03..873a6c4ed 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
 
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 7e255db5b..f25bf6f76 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -843,6 +843,43 @@ resources:
           template:
             get_file: k8s_vm_entrypoint.sh
 
+  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:
+    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: 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
+
 outputs:
   rancher_vm_ip:
     description: The IP address of the rancher instance
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..b9e4f10bb 100755
--- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
+++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
@@ -103,7 +103,7 @@ for VM_NUM in $(seq 3); do
     VM_TYPE=etcd HOST_LABEL=etcd VM_NUM=$VM_NUM envsubst < $PARTS_DIR/onap-oom-2.yaml
 done
 
-for VM_NUM in $(seq 1); do
+for VM_NUM in $(seq 2); do
     VM_TYPE=orch HOST_LABEL=orchestration VM_NUM=$VM_NUM envsubst < $PARTS_DIR/onap-oom-2.yaml
 done
 
-- 
cgit 1.2.3-korg