aboutsummaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-10-27 17:26:57 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-27 17:26:57 +0000
commit67b8c3aae4c9197df37e53bc7a78616c43b9b72e (patch)
tree042532d6077a590b47a0109b125f799d2cb80f6f /heat
parent420b01ef3ec000d9e1c8ff42e904c71445577bb7 (diff)
parent9ae5fe2676a7e44dac189158029e3025ae90496d (diff)
Merge "Fixed vbrg Install, env and yaml scipts"
Diffstat (limited to 'heat')
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env6
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml64
2 files changed, 35 insertions, 35 deletions
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
index ea8bc823..ef49dcf2 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
@@ -5,10 +5,10 @@
vbrgemu_bng_private_net_id: zdfw1bngin01_private
vbrgemu_bng_private_subnet_id: zdfw1bngin01_sub_private
vbrgemu_bng_private_net_cidr: 10.3.0.0/24
- vbrgemu_private_net_id: zdfw1vbrgemu01_private
- vbrgemu_private_net_cidr: 192.168.1.0/24
+ #vbrgemu_private_net_id: zdfw1vbrgemu01_private
+ #vbrgemu_private_net_cidr: 192.168.1.0/24
vbrgemu_private_ip_0: 10.3.0.4
- vbrgemu_private_ip_1: 192.168.1.1
+ #vbrgemu_private_ip_1: 192.168.1.1
sdnc_ip: 10.0.7.1
vbrgemu_name_0: zdcpe1cpe01brgemu01
vnf_id: vCPE_Infrastructure_BGREMU_demo_app
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
index a9eb8726..192dfbfc 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
@@ -59,22 +59,22 @@ parameters:
type: string
label: vBNG IN private network CIDR
description: The CIDR of the input side of vBNG private network
- vbrgemu_private_net_id:
- type: string
- label: vBRGEMU Home private network name or ID
- description: Private network that connects vBRGEMU to local devices
- vbrgemu_private_net_cidr:
- type: string
- label: vBRGEMU Home private network CIDR
- description: The CIDR of the input side of vBRGEMU Home private network
+ #vbrgemu_private_net_id:
+ # type: string
+ # label: vBRGEMU Home private network name or ID
+ # description: Private network that connects vBRGEMU to local devices
+ #vbrgemu_private_net_cidr:
+ # type: string
+ # label: vBRGEMU Home private network CIDR
+ # description: The CIDR of the input side of vBRGEMU Home private network
vbrgemu_private_ip_0:
type: string
label: vGW private IP address
description: Private IP address towards the BRGEMU-BNG network
- vbrgemu_private_ip_1:
- type: string
- label: vGW private IP address
- description: Private IP address towards the BRGEMU private network
+ #vbrgemu_private_ip_1:
+ # type: string
+ # label: vGW private IP address
+ # description: Private IP address towards the BRGEMU private network
vbrgemu_name_0:
type: string
label: vGW name
@@ -165,17 +165,17 @@ resources:
public_key: { get_param: pub_key }
save_private_key: false
- vbrgemu_private_network:
- type: OS::Neutron::Net
- properties:
- name: { get_param: vbrgemu_private_net_id }
+ #vbrgemu_private_network:
+ # type: OS::Neutron::Net
+ # properties:
+ # name: { get_param: vbrgemu_private_net_id }
- vbrgemu_private_subnet:
- type: OS::Neutron::Subnet
- properties:
- name: { get_param: vbrgemu_private_net_id }
- network_id: { get_resource: vbrgemu_private_network }
- cidr: { get_param: vbrgemu_private_net_cidr }
+ #vbrgemu_private_subnet:
+ # type: OS::Neutron::Subnet
+ # properties:
+ # name: { get_param: vbrgemu_private_net_id }
+ # network_id: { get_resource: vbrgemu_private_network }
+ # cidr: { get_param: vbrgemu_private_net_cidr }
# Virtual BRG Emulator Instantiation
# 0_port should get IP address from DHCP discover through vBNG once the VNF is running
@@ -185,11 +185,11 @@ resources:
network: { get_param: vbrgemu_bng_private_net_id }
fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}]
- vbrgemu_private_1_port:
- type: OS::Neutron::Port
- properties:
- network: { get_resource: vbrgemu_private_network }
- fixed_ips: [{"subnet": { get_resource: vbrgemu_private_subnet }, "ip_address": { get_param: vbrgemu_private_ip_1 }}]
+ #vbrgemu_private_1_port:
+ # type: OS::Neutron::Port
+ # properties:
+ # network: { get_resource: vbrgemu_private_network }
+ # fixed_ips: [{"subnet": { get_resource: vbrgemu_private_subnet }, "ip_address": { get_param: vbrgemu_private_ip_1 }}]
vbrgemu_0:
type: OS::Nova::Server
@@ -201,14 +201,14 @@ resources:
networks:
- network: { get_param: public_net_id }
- port: { get_resource: vbrgemu_private_0_port }
- - port: { get_resource: vbrgemu_private_1_port }
+ # - port: { get_resource: vbrgemu_private_1_port }
metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
user_data_format: RAW
user_data:
str_replace:
params:
- __brgemu_net_ipaddr__: { get_param: vbrgemu_private_ip_1 }
- __brgemu_cidr__: { get_param: vbrgemu_private_net_cidr }
+ # __brgemu_net_ipaddr__: { get_param: vbrgemu_private_ip_1 }
+ # __brgemu_cidr__: { get_param: vbrgemu_private_net_cidr }
__brgemu_bng_private_net_cidr__: { get_param: vbrgemu_bng_private_net_cidr }
__repo_url_blob__ : { get_param: repo_url_blob }
__repo_url_artifacts__ : { get_param: repo_url_artifacts }
@@ -226,8 +226,8 @@ resources:
# Create configuration files
mkdir /opt/config
- echo "__brgemu_net_ipaddr__" > /opt/config/brgemu_net_ipaddr.txt
- echo "__brgemu_cidr__" > /opt/config/brgemu_net_cidr.txt
+ #echo "__brgemu_net_ipaddr__" > /opt/config/brgemu_net_ipaddr.txt
+ #echo "__brgemu_cidr__" > /opt/config/brgemu_net_cidr.txt
echo "__brgemu_bng_private_net_cidr__" > /opt/config/brgemu_bng_private_net_cidr.txt
echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt