summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--heat/ONAP/onap_openstack_light.yaml2
-rw-r--r--heat/vCPE/infra/base_vcpe_infra.env4
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng.env4
-rw-r--r--heat/vCPE/vgmux/base_vcpe_vgmux.env4
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw.env4
-rw-r--r--heat/vFW/base_vfw.env8
-rw-r--r--heat/vFWCL/vFWSNK/base_vfw.env8
-rw-r--r--heat/vFWCL/vPKG/base_vpkg.env4
-rw-r--r--heat/vLB/base_vlb.env8
-rw-r--r--heat/vLB/dnsscaling.env4
-rw-r--r--heat/vLBMS/base_vlb.env8
-rw-r--r--heat/vLBMS/dnsscaling.env4
12 files changed, 31 insertions, 31 deletions
diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml
index 6404d1c7..64e1e450 100644
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -1699,7 +1699,7 @@ resources:
flavor: { get_param: flavor_small }
name:
str_replace:
- template: base-dcae-bootstrap
+ template: base-dcae
params:
base: { get_param: vm_base_name }
key_name: { get_resource: vm_key }
diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env
index 7a49e9b3..43e05f78 100644
--- a/heat/vCPE/infra/base_vcpe_infra.env
+++ b/heat/vCPE/infra/base_vcpe_infra.env
@@ -26,8 +26,8 @@ parameters:
vweb_name_0: zdcpe1cpe01web01
vnf_id: vCPE_Infrastructure_demo_app
vf_module_id: vCPE_Intrastructure
- dcae_collector_ip: 10.0.4.102
- dcae_collector_port: 8080
+ dcae_collector_ip: 10.0.4.1
+ dcae_collector_port: 8081
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.2.0
diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env
index 999887b3..97f5ac9d 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng.env
+++ b/heat/vCPE/vbng/base_vcpe_vbng.env
@@ -22,8 +22,8 @@
vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app
vf_module_id: vCPE_Intrastructure_Metro_vBNG
sdnc_ip_addr: 10.0.7.1
- dcae_collector_ip: 10.0.4.102
- dcae_collector_port: 8080
+ dcae_collector_ip: 10.0.4.1
+ dcae_collector_port: 8081
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.2.0
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env
index 7dda6eda..a76fde6e 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.env
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env
@@ -19,8 +19,8 @@
vnf_id: vCPE_Infrastructure_vGMUX_demo_app
vf_module_id: vCPE_Intrastructure_Metro_vGMUX
bng_gmux_private_ip: 10.1.0.10
- dcae_collector_ip: 10.0.4.102
- dcae_collector_port: 8080
+ dcae_collector_ip: 10.0.4.1
+ dcae_collector_port: 8081
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.2.0
diff --git a/heat/vCPE/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env
index a2fa81b3..d2f67a91 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw.env
+++ b/heat/vCPE/vgw/base_vcpe_vgw.env
@@ -19,8 +19,8 @@
vf_module_id: vCPE_Customer_GW
mux_ip_addr: 10.5.0.20
vg_vgmux_tunnel_vni: 100
- dcae_collector_ip: 10.0.4.102
- dcae_collector_port: 8080
+ dcae_collector_ip: 10.0.4.1
+ dcae_collector_port: 8081
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.2.0
diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env
index b856205f..c6591ef1 100644
--- a/heat/vFW/base_vfw.env
+++ b/heat/vFW/base_vfw.env
@@ -1,6 +1,6 @@
parameters:
- vfw_image_name: PUT THE VM IMAGE NAME HERE
- vfw_flavor_name: PUT THE VM FLAVOR NAME HERE
+ vfw_image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404)
+ vfw_flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested)
public_net_id: PUT THE PUBLIC NETWORK ID HERE
unprotected_private_net_id: zdfw1fwl01_unprotected
protected_private_net_id: zdfw1fwl01_protected
@@ -21,8 +21,8 @@ parameters:
vsn_name_0: zdfw1fwl01snk01
vnf_id: vFirewall_demo_app
vf_module_id: vFirewall
- dcae_collector_ip: 10.0.4.102
- dcae_collector_port: 8080
+ dcae_collector_ip: 10.0.4.1
+ dcae_collector_port: 8081
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.2.0
diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env
index 4d34b585..aec1660e 100644
--- a/heat/vFWCL/vFWSNK/base_vfw.env
+++ b/heat/vFWCL/vFWSNK/base_vfw.env
@@ -1,6 +1,6 @@
parameters:
- image_name: PUT THE VM IMAGE NAME HERE
- flavor_name: PUT THE VM FLAVOR NAME HERE
+ image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404)
+ flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested)
public_net_id: PUT THE PUBLIC NETWORK ID HERE
unprotected_private_net_id: zdfw1fwl01_unprotected
unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
@@ -21,8 +21,8 @@ parameters:
vsn_name_0: zdfw1fwl01snk01
vnf_id: vFirewall_demo_app
vf_module_id: vFirewallCL
- dcae_collector_ip: PUT THE ADDRESS OF THE DCAE COLLECTOR HERE
- dcae_collector_port: 8080
+ dcae_collector_ip: 10.0.4.1
+ dcae_collector_port: 8081
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.2.0
diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env
index 57662eee..ff8d4626 100644
--- a/heat/vFWCL/vPKG/base_vpkg.env
+++ b/heat/vFWCL/vPKG/base_vpkg.env
@@ -1,6 +1,6 @@
parameters:
- image_name: PUT THE VM IMAGE NAME HERE
- flavor_name: PUT THE VM FLAVOR NAME HERE
+ image_name: PUT THE VM IMAGE NAME HERE (UBUNTU 1404)
+ flavor_name: PUT THE VM FLAVOR NAME HERE (m1.medium suggested)
public_net_id: PUT THE PUBLIC NETWORK ID HERE
unprotected_private_net_id: zdfw1fwl01_unprotected
unprotected_private_subnet_id: zdfw1fwl01_unprotected_sub
diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env
index a9658886..c0a8334a 100644
--- a/heat/vLB/base_vlb.env
+++ b/heat/vLB/base_vlb.env
@@ -1,6 +1,6 @@
parameters:
- vlb_image_name: PUT THE IMAGE NAME HERE
- vlb_flavor_name: PUT THE FLAVOR NAME HERE
+ vlb_image_name: PUT THE IMAGE NAME HERE (UBUNTU 1604)
+ vlb_flavor_name: PUT THE FLAVOR NAME HERE (m1.medium suggested)
public_net_id: PUT THE NETWORK ID HERE
vlb_private_net_id: zdfw1lb01_private
pktgen_private_net_id: zdfw1pktgen01_private
@@ -24,8 +24,8 @@ parameters:
vpg_name_0: zdfw1lb01pg01
vnf_id: vLoadBalancer_demo_app
vf_module_id: vLoadBalancer
- dcae_collector_ip: PUT THE ADDRESS OF THE DCAE COLLECTOR HERE
- dcae_collector_port: 8080
+ dcae_collector_ip: 10.0.4.1
+ dcae_collector_port: 8081
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.2.0
diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env
index 94058f6d..21983747 100644
--- a/heat/vLB/dnsscaling.env
+++ b/heat/vLB/dnsscaling.env
@@ -1,6 +1,6 @@
parameters:
- vlb_image_name: PUT THE IMAGE NAME HERE
- vlb_flavor_name: PUT THE FLAVOR NAME HERE
+ vlb_image_name: PUT THE IMAGE NAME HERE (UBUNTU 1604)
+ vlb_flavor_name: PUT THE FLAVOR NAME HERE (m1.medium suggested)
public_net_id: PUT THE NETWORK ID HERE
vlb_private_net_id: zdfw1lb01_private
onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env
index a9658886..c0a8334a 100644
--- a/heat/vLBMS/base_vlb.env
+++ b/heat/vLBMS/base_vlb.env
@@ -1,6 +1,6 @@
parameters:
- vlb_image_name: PUT THE IMAGE NAME HERE
- vlb_flavor_name: PUT THE FLAVOR NAME HERE
+ vlb_image_name: PUT THE IMAGE NAME HERE (UBUNTU 1604)
+ vlb_flavor_name: PUT THE FLAVOR NAME HERE (m1.medium suggested)
public_net_id: PUT THE NETWORK ID HERE
vlb_private_net_id: zdfw1lb01_private
pktgen_private_net_id: zdfw1pktgen01_private
@@ -24,8 +24,8 @@ parameters:
vpg_name_0: zdfw1lb01pg01
vnf_id: vLoadBalancer_demo_app
vf_module_id: vLoadBalancer
- dcae_collector_ip: PUT THE ADDRESS OF THE DCAE COLLECTOR HERE
- dcae_collector_port: 8080
+ dcae_collector_ip: 10.0.4.1
+ dcae_collector_port: 8081
repo_url_blob: https://nexus.onap.org/content/sites/raw
repo_url_artifacts: https://nexus.onap.org/content/groups/staging
demo_artifacts_version: 1.2.0
diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env
index f340837b..3fa627d5 100644
--- a/heat/vLBMS/dnsscaling.env
+++ b/heat/vLBMS/dnsscaling.env
@@ -1,6 +1,6 @@
parameters:
- vlb_image_name: PUT THE IMAGE NAME HERE
- vlb_flavor_name: PUT THE FLAVOR NAME HERE
+ vlb_image_name: PUT THE IMAGE NAME HERE (UBUNTU 1604)
+ vlb_flavor_name: PUT THE FLAVOR NAME HERE (m1.medium suggested)
public_net_id: PUT THE NETWORK ID HERE
vlb_private_net_id: zdfw1lb01_private
onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE