Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Shorten VM names to match Ansible
[demo.git]
/
preload_data
/
vFWDT
/
preload_data.json
diff --git
a/preload_data/vFWDT/preload_data.json
b/preload_data/vFWDT/preload_data.json
index
3d70f82
..
4af4622
100644
(file)
--- a/
preload_data/vFWDT/preload_data.json
+++ b/
preload_data/vFWDT/preload_data.json
@@
-1,16
+1,16
@@
{
"vfwdt_vpkg_preload.template": {
{
"vfwdt_vpkg_preload.template": {
- "unprotected_private_net_id" : "v
o
fwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id" : "v
o
fwlsnk_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",
"unprotected_private_net_cidr" : "192.168.10.0/24",
"protected_private_net_cidr" : "192.168.20.0/24",
- "vpg_name_0":"v
o
fwl01pgn${hostid}",
- "vfw_name_0": "v
o
fwl01vfw${hostid}",
- "vsn_name_0": "v
o
fwl01snk${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}",
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
"flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "protected_private_net_id" : "v
o
fwlsnk01_protected${hostid}",
- "protected_private_subnet_id" : "v
o
fwlsnk01_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",
"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": {
"vsn_private_ip_2": "10.100.100.3"
},
"vfwdt_vfwsnk0_preload.template": {
- "unprotected_private_net_id" : "v
o
fwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id" : "v
o
fwlsnk_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",
"unprotected_private_net_cidr" : "192.168.10.0/24",
"protected_private_net_cidr" : "192.168.20.0/24",
- "vsn_name_0": "v
o
fwl01snk${hostid}",
- "vfw_name_0": "v
o
fwl01vfw${hostid}",
+ "vsn_name_0": "vfwl01snk${hostid}",
+ "vfw_name_0": "vfwl01vfw${hostid}",
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
"flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
"flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "protected_private_net_id" : "v
o
fwlsnk01_protected${hostid}",
- "protected_private_subnet_id" : "v
o
fwlsnk01_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",
"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": {
"vsn_private_ip_2": "10.100.100.3"
},
"vfwdt_vfwsnk1_preload.template": {
- "unprotected_private_net_id" : "v
o
fwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id" : "v
o
fwlsnk_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",
"unprotected_private_net_cidr" : "192.168.10.0/24",
"protected_private_net_cidr" : "192.168.20.0/24",
- "vsn_name_0": "v
o
fwl02snk${hostid}",
- "vfw_name_0": "v
o
fwl02vfw${hostid}",
+ "vsn_name_0": "vfwl02snk${hostid}",
+ "vfw_name_0": "vfwl02vfw${hostid}",
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
"flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
"flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
- "protected_private_net_id" : "v
o
fwlsnk01_protected${hostid}",
- "protected_private_subnet_id" : "v
o
fwlsnk01_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",
"ext_private_net_id": "onap_oam_ext",
"ext_private_subnet_id": "onap_oam_ext",
"ext_private_net_cidr": "10.100.0.0/16",