From a2f5de8a31d18dfa8d079a585ab0b4a6d8d7b1c3 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Fri, 31 May 2019 09:10:51 -0500 Subject: Shorten VM names to match Ansible Issue-ID: INT-1092 Change-Id: Iff1f8dca489686025a6a791a46e9643b633d1c49 Signed-off-by: Brian Freeman --- preload_data/vFWDT/README.md | 4 ++++ preload_data/vFWDT/preload_data.json | 38 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 19 deletions(-) (limited to 'preload_data/vFWDT') diff --git a/preload_data/vFWDT/README.md b/preload_data/vFWDT/README.md index f04ab257..7759ccae 100644 --- a/preload_data/vFWDT/README.md +++ b/preload_data/vFWDT/README.md @@ -3,3 +3,7 @@ # # onap_oam_ext (network and subnet have same name) must be setup in Openstack and an interface from that network attached to a neutron router with the onap_oam # network + +# The strings for hostnames in name_0 parameters should be 13 characters based on the rules in the Ansible server BuildHostFile.py +# this can be changed as needed by a Service Provider as long as it matches the corresponding playbook assumptions +# diff --git a/preload_data/vFWDT/preload_data.json b/preload_data/vFWDT/preload_data.json index 3d70f820..4af4622d 100644 --- a/preload_data/vFWDT/preload_data.json +++ b/preload_data/vFWDT/preload_data.json @@ -1,16 +1,16 @@ { "vfwdt_vpkg_preload.template": { - "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_id" : "vfwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id" : "vfwlsnk_unprotected_sub${hostid}", "unprotected_private_net_cidr" : "192.168.10.0/24", "protected_private_net_cidr" : "192.168.20.0/24", - "vpg_name_0":"vofwl01pgn${hostid}", - "vfw_name_0": "vofwl01vfw${hostid}", - "vsn_name_0": "vofwl01snk${hostid}", + "vpg_name_0":"vfwl01pgn${hostid}", + "vfw_name_0": "vfwl01vfw${hostid}", + "vsn_name_0": "vfwl01snk${hostid}", "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "protected_private_net_id" : "vofwlsnk01_protected${hostid}", - "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}", + "protected_private_net_id" : "vfwlsnk01_protected${hostid}", + "protected_private_subnet_id" : "vfwlsnk01_protected_sub${hostid}", "ext_private_net_id": "onap_oam_ext", "ext_private_subnet_id": "onap_oam_ext", "ext_private_net_cidr": "10.100.0.0/16", @@ -26,16 +26,16 @@ "vsn_private_ip_2": "10.100.100.3" }, "vfwdt_vfwsnk0_preload.template": { - "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_id" : "vfwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id" : "vfwlsnk_unprotected_sub${hostid}", "unprotected_private_net_cidr" : "192.168.10.0/24", "protected_private_net_cidr" : "192.168.20.0/24", - "vsn_name_0": "vofwl01snk${hostid}", - "vfw_name_0": "vofwl01vfw${hostid}", + "vsn_name_0": "vfwl01snk${hostid}", + "vfw_name_0": "vfwl01vfw${hostid}", "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "protected_private_net_id" : "vofwlsnk01_protected${hostid}", - "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}", + "protected_private_net_id" : "vfwlsnk01_protected${hostid}", + "protected_private_subnet_id" : "vfwlsnk01_protected_sub${hostid}", "ext_private_net_id": "onap_oam_ext", "ext_private_subnet_id": "onap_oam_ext", "ext_private_net_cidr": "10.100.0.0/16", @@ -51,16 +51,16 @@ "vsn_private_ip_2": "10.100.100.3" }, "vfwdt_vfwsnk1_preload.template": { - "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_id" : "vfwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id" : "vfwlsnk_unprotected_sub${hostid}", "unprotected_private_net_cidr" : "192.168.10.0/24", "protected_private_net_cidr" : "192.168.20.0/24", - "vsn_name_0": "vofwl02snk${hostid}", - "vfw_name_0": "vofwl02vfw${hostid}", + "vsn_name_0": "vfwl02snk${hostid}", + "vfw_name_0": "vfwl02vfw${hostid}", "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "protected_private_net_id" : "vofwlsnk01_protected${hostid}", - "protected_private_subnet_id" : "vofwlsnk01_protected_sub${hostid}", + "protected_private_net_id" : "vfwlsnk01_protected${hostid}", + "protected_private_subnet_id" : "vfwlsnk01_protected_sub${hostid}", "ext_private_net_id": "onap_oam_ext", "ext_private_subnet_id": "onap_oam_ext", "ext_private_net_cidr": "10.100.0.0/16", -- cgit 1.2.3-korg