Run k8s orchestration plane in dedicated VM

[integration.git] / deployment / heat / onap-oom / scripts / gen-onap-oom-yaml.sh

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 41c5de1..5700111 100755 (executable)
--- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
+++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
@@ -65,6 +65,7 @@ cat <<EOF
             __oam_network_cidr__: { get_param: oam_network_cidr }
             __oam_network_id__: { get_resource: oam_network }
             __oam_subnet_id__: { get_resource: oam_subnet }
+            __sec_group__: { get_resource: onap_sg }
             __k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] }
             __k8s_vm_ips__: [
 EOF
@@ -93,9 +94,18 @@ cat <<EOF
 EOF
 
 for VM_NUM in $(seq $NUM_K8S_VMS); do
-    K8S_VM_NAME=k8s_$VM_NUM envsubst < $PARTS_DIR/onap-oom-2.yaml
+    VM_TYPE=k8s HOST_LABEL=compute VM_NUM=$VM_NUM envsubst < $PARTS_DIR/onap-oom-2.yaml
 done
 
+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
+    VM_TYPE=orch HOST_LABEL=orchestration VM_NUM=$VM_NUM envsubst < $PARTS_DIR/onap-oom-2.yaml
+done
+
+
 cat $PARTS_DIR/onap-oom-3.yaml
 
 for VM_NUM in $(seq $NUM_K8S_VMS); do