From 3fd6c2aac97baeb7e9a5d9f9d3a09fced70ddd37 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Sun, 28 Oct 2018 21:44:00 -0700
Subject: Enable k8s resiliency planes

Enable k8s resiliency planes and also reduce the number of
k8s compute hosts down to 12 x 16 GB.

Change-Id: I090495de2ac9986c0c85c19a503c44beca9e8fb6
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 deployment/heat/onap-oom/parts/onap-oom-1.yaml | 16 ++++++++++++----
 deployment/heat/onap-oom/parts/onap-oom-2.yaml | 15 ++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

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

diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
index ab79b1ed5..3c34f7544 100644
--- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
@@ -28,6 +28,14 @@ parameters:
     type: string
     description: VM flavor for k8s hosts
 
+  etcd_vm_flavor:
+    type: string
+    description: VM flavor for etcd hosts
+
+  orch_vm_flavor:
+    type: string
+    description: VM flavor for orch hosts
+
   integration_override_yaml:
     type: string
     description: Content for integration_override.yaml
@@ -58,19 +66,19 @@ parameters:
 
   docker_version:
     type: string
-    default: "17.03"
+    default: "17.03.2"
 
   rancher_version:
     type: string
-    default: "1.6.18"
+    default: "1.6.22"
 
   rancher_agent_version:
     type: string
-    default: "1.2.10"
+    default: "1.2.11"
 
   kubectl_version:
     type: string
-    default: "1.8.10"
+    default: "1.11.2"
 
   helm_version:
     type: string
diff --git a/deployment/heat/onap-oom/parts/onap-oom-2.yaml b/deployment/heat/onap-oom/parts/onap-oom-2.yaml
index e01ba132d..ff2272d92 100644
--- a/deployment/heat/onap-oom/parts/onap-oom-2.yaml
+++ b/deployment/heat/onap-oom/parts/onap-oom-2.yaml
@@ -1,4 +1,4 @@
-  ${K8S_VM_NAME}_private_port:
+  ${VM_TYPE}_${VM_NUM}_private_port:
     type: OS::Neutron::Port
     properties:
       network: { get_resource: oam_network }
@@ -6,22 +6,22 @@
       security_groups:
       - { get_resource: onap_sg }
 
-  ${K8S_VM_NAME}_floating_ip:
+  ${VM_TYPE}_${VM_NUM}_floating_ip:
     type: OS::Neutron::FloatingIP
     properties:
       floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: ${K8S_VM_NAME}_private_port }
+      port_id: { get_resource: ${VM_TYPE}_${VM_NUM}_private_port }
 
-  ${K8S_VM_NAME}_vm:
+  ${VM_TYPE}_${VM_NUM}_vm:
     type: OS::Nova::Server
     properties:
       name:
-        list_join: ['-', [ { get_param: 'OS::stack_name' }, '${K8S_VM_NAME}']]
+        list_join: ['-', [ { get_param: 'OS::stack_name' }, '${VM_TYPE}', '${VM_NUM}' ] ]
       image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: k8s_vm_flavor }
+      flavor: { get_param: ${VM_TYPE}_vm_flavor }
       key_name: { get_param: key_name }
       networks:
-      - port: { get_resource: ${K8S_VM_NAME}_private_port }
+      - port: { get_resource: ${VM_TYPE}_${VM_NUM}_private_port }
       user_data_format: RAW
       user_data:
         str_replace:
@@ -31,6 +31,7 @@
             __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
 
-- 
cgit 1.2.3-korg