summaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2017-08-03 16:56:05 -0500
committerBrian Freeman <bf1936@att.com>2017-08-03 17:04:58 -0500
commit7ef5928d077cedf46b1e0cd9c40f4443bb640706 (patch)
treea86e0e61f4e2daf7f0c584cc78408ffa07fd1943 /heat
parent0f0a35c8b21465e2c9c6fd6fe58dd054b49bfcb6 (diff)
Added webserver and update ONAP OAM CIDR
Change-Id: I831b3cb0313402d1f409dc099137053a7c637164 Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'heat')
-rw-r--r--heat/vCPE/infra/base_vcpe_infra_rackspace.env3
-rw-r--r--heat/vCPE/infra/base_vcpe_infra_rackspace.yaml73
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng_rackspace.env2
-rw-r--r--heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml3
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw_rackspace.env2
5 files changed, 76 insertions, 7 deletions
diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.env b/heat/vCPE/infra/base_vcpe_infra_rackspace.env
index 2ec1a0b8..ea709810 100644
--- a/heat/vCPE/infra/base_vcpe_infra_rackspace.env
+++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.env
@@ -15,9 +15,12 @@ parameters:
vaaa_private_ip_1: 10.0.101.2
vdns_private_ip_0: 10.2.0.1
vdns_private_ip_1: 10.0.101.3
+ vweb_private_ip_0: 10.2.0.10
+ vweb_private_ip_1: 10.0.101.40
vaaa_name_0: zdcpe1cpe01aaa01
vdns_name_0: zdcpe11cpe01dns01
vdhcp_name_0: zdcpe1cpe01dhcp01
+ vweb_name_0: zdcpe1cpe01web01
vnf_id: vCPE_Infrastructure_demo_app
vf_module_id: vCPE_Intrastructure
dcae_collector_ip: 10.0.4.102
diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml
index 14e82500..8e93bdc5 100644
--- a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml
+++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml
@@ -24,7 +24,7 @@
heat_template_version: 2013-05-23
-description: Heat template to deploy vCPE Infrastructue emlements (vAAA, vDHCP, vDNS_DHCP) for ONAP
+description: Heat template to deploy vCPE Infrastructue emlements (vAAA, vDHCP, vDNS_DHCP, webServer_sink) for ONAP
##############
# #
@@ -97,6 +97,14 @@ parameters:
type: string
label: vDNS private IP address towards the ONAP management network
description: Private IP address that is assigned to the vDHCP to communicate with ONAP components
+ vweb_private_ip_0:
+ type: string
+ label: vWEB private IP address towards the vGW
+ description: Private IP address that is assigned to the vWEB to communicate with the vGWs
+ vweb_private_ip_1:
+ type: string
+ label: vWEB private IP address towards the ONAP management network
+ description: Private IP address that is assigned to the vWEB to communicate with ONAP components
vaaa_name_0:
type: string
label: vAAA name
@@ -109,6 +117,10 @@ parameters:
type: string
label: vDHCP name
description: Name of the vDHCP
+ vweb_name_0:
+ type: string
+ label: vWEB name
+ description: Name of the vWEB
vnf_id:
type: string
label: VNF ID
@@ -202,7 +214,7 @@ resources:
cidr: { get_param: cpe_public_net_cidr }
- # Virtual Load Balancer Instantiation
+ # Virtual AAA server Instantiation
vaaa_private_0_port:
type: OS::Neutron::Port
properties:
@@ -374,3 +386,60 @@ resources:
cd /opt
chmod +x v_dhcp_install.sh
./v_dhcp_install.sh
+
+ # vWEB instantiaion
+ vweb_private_0_port:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_resource: cpe_public_network }
+ fixed_ips: [{"subnet": { get_resource: cpe_public_subnet }, "ip_address": { get_param: vweb_private_ip_0 }}]
+
+ vdhcp_private_1_port:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_param: onap_private_net_id }
+ fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vweb_private_ip_1 }}]
+
+
+ vweb_0:
+ type: OS::Nova::Server
+ properties:
+ image: { get_param: vcpe_image_name }
+ flavor: { get_param: vcpe_flavor_name }
+ name: { get_param: vweb_name_0 }
+ key_name: { get_resource: my_keypair }
+ networks:
+ - network: { get_param: public_net_id }
+ - port: { get_resource: vweb_private_0_port }
+ - port: { get_resource: vweb_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:
+ __web_oam_int__ : { get_param: vweb_private_ip_1 }
+ __web_private_ipaddr__: { get_param: vweb_private_ip_0 }
+ __local_private_ipaddr__: { get_param: vweb_private_ip_0 }
+ __repo_url_blob__ : { get_param: repo_url_blob }
+ __repo_url_artifacts__ : { get_param: repo_url_artifacts }
+ __demo_artifacts_version__ : { get_param: demo_artifacts_version }
+ __install_script_version__ : { get_param: install_script_version }
+ __cloud_env__ : { get_param: cloud_env }
+ template: |
+ #!/bin/bash
+
+ # Create configuration files
+ mkdir /opt/config
+ echo "__web_oam_int__" > /opt/config/lb_oam_int.txt
+ echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt
+ echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
+ echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
+ echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
+ echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
+ echo "__install_script_version__" > /opt/config/install_script_version.txt
+ echo "__cloud_env__" > /opt/config/cloud_env.txt
+
+ # Download and run install script
+ curl -k __repo_url_blob__/org.onap.demo/vnfs/vdhcp/__install_script_version__/v_dhcp_install.sh -o /opt/v_dhcp_install.sh
+ cd /opt
+ chmod +x v_dhcp_install.sh
diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
index 2cf43259..015f3feb 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
+++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env
@@ -8,7 +8,7 @@
onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE>
brgemu_bng_private_net_cidr: 10.3.0.0/24
bng_gmux_private_net_cidr: 10.1.0.0/24
- onap_private_net_cidr: 10.0.0.0/8
+ onap_private_net_cidr: 10.0.0.0/16
vbng_private_ip_0: 10.3.0.1
vbng_private_ip_1: 10.0.101.10
vbng_private_ip_2: 10.1.0.10
diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
index efd2055d..79b41d91 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
+++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
@@ -305,10 +305,7 @@ resources:
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vgmux/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
-=======
curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vbng/__install_script_version__/v_bng_install.sh -o /opt/v_bng_install.sh
->>>>>>> 12724d7... Updatd after network review 2017-08-03:heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml
cd /opt
chmod +x v_bng_install.sh
./v_bng_install.sh
diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env
index 4ab63bf7..080a999c 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env
+++ b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env
@@ -8,7 +8,7 @@
cpe_public_subnet_id: zdfw1cpe01_public
onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE>
onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE>
- onap_private_net_cidr: 10.0.0.0/8
+ onap_private_net_cidr: 10.0.0.0/16
vgw_private_ip_0: 192.168.0.0
vgw_private_ip_1: 10.0.101.30
vgw_name_0: zdcpe11cpe01gw01