diff options
Diffstat (limited to 'heat/vCPE')
| -rw-r--r-- | heat/vCPE/infra/base_vcpe_infra.yaml | 52 | ||||
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng.yaml | 6 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml | 8 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux.yaml | 22 | ||||
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw.yaml | 15 |
5 files changed, 51 insertions, 52 deletions
diff --git a/heat/vCPE/infra/base_vcpe_infra.yaml b/heat/vCPE/infra/base_vcpe_infra.yaml index e6c9d82c..9d26bb67 100644 --- a/heat/vCPE/infra/base_vcpe_infra.yaml +++ b/heat/vCPE/infra/base_vcpe_infra.yaml @@ -1,7 +1,7 @@ ########################################################################## # #==================LICENSE_START========================================== -# +# # # Copyright 2017 AT&T Intellectual Property. All rights reserved. # @@ -108,7 +108,7 @@ parameters: vweb_private_ip_0: type: string label: vWEB private IP address towards the CPE_PUBLIC private network - description: Private IP address that is assigned to the vWEB to communicate with the vGWs + 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 @@ -128,7 +128,7 @@ parameters: vweb_name_0: type: string label: vWEB name - description: Name of the vWEB + description: Name of the vWEB vnf_id: type: string label: VNF ID @@ -148,11 +148,11 @@ parameters: mr_ip_addr: type: string label: Message Router IP address - description: IP address of the Message Router that for vDHCP configuration + description: IP address of the Message Router that for vDHCP configuration mr_ip_port: type: string - label: Message Router Port - description: IP port of the Message Router that for vDHCP configuration + label: Message Router Port + description: IP port of the Message Router that for vDHCP configuration key_name: type: string label: Key pair name @@ -239,9 +239,9 @@ resources: __oam_ipaddr__: { get_param: vaaa_private_ip_1 } __oam_cidr__: { get_param: onap_private_net_cidr } __cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __install_script_version__ : { get_param: install_script_version } - __cloud_env__ : { get_param: cloud_env } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __install_script_version__: { get_param: install_script_version } + __cloud_env__: { get_param: cloud_env } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -299,13 +299,13 @@ resources: user_data: str_replace: params: - __oam_ipaddr__ : { get_param: vdns_private_ip_1 } + __oam_ipaddr__: { get_param: vdns_private_ip_1 } __cpe_public_net_ipaddr__: { get_param: vdns_private_ip_0 } __oam_cidr__: { get_param: onap_private_net_cidr } __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __install_script_version__ : { get_param: install_script_version } - __cloud_env__ : { get_param: cloud_env } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __install_script_version__: { get_param: install_script_version } + __cloud_env__: { get_param: cloud_env } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -361,15 +361,15 @@ resources: user_data: str_replace: params: - __oam_ipaddr__ : { get_param: vdhcp_private_ip_1 } - __cpe_signal_ipaddr__ : { get_param: vdhcp_private_ip_0 } - __oam_cidr__ : { get_param: onap_private_net_cidr } - __cpe_signal_net_cidr__ : { get_param: cpe_signal_net_cidr } - __mr_ip_addr__ : { get_param: mr_ip_addr } - __mr_ip_port__ : { get_param: mr_ip_port } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __install_script_version__ : { get_param: install_script_version } - __cloud_env__ : { get_param: cloud_env } + __oam_ipaddr__: { get_param: vdhcp_private_ip_1 } + __cpe_signal_ipaddr__: { get_param: vdhcp_private_ip_0 } + __oam_cidr__: { get_param: onap_private_net_cidr } + __cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr } + __mr_ip_addr__: { get_param: mr_ip_addr } + __mr_ip_port__: { get_param: mr_ip_port } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __install_script_version__: { get_param: install_script_version } + __cloud_env__: { get_param: cloud_env } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -427,13 +427,13 @@ resources: user_data: str_replace: params: - __oam_ipaddr__ : { get_param: vweb_private_ip_1 } + __oam_ipaddr__: { get_param: vweb_private_ip_1 } __cpe_public_ipaddr__: { get_param: vweb_private_ip_0 } __oam_cidr__: { get_param: onap_private_net_cidr } __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __install_script_version__ : { get_param: install_script_version } - __cloud_env__ : { get_param: cloud_env } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __install_script_version__: { get_param: install_script_version } + __cloud_env__: { get_param: cloud_env } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash diff --git a/heat/vCPE/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml index 7a12e5b6..e6a71343 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.yaml +++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml @@ -237,9 +237,9 @@ resources: __bng_gmux_cidr__: { get_param: bng_gmux_private_net_cidr } __dcae_collector_ip__: { get_param: dcae_collector_ip } __dcae_collector_port__: { get_param: dcae_collector_port } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __script_version__ : { get_param: script_version } - __cloud_env__ : { get_param: cloud_env } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __script_version__: { get_param: script_version } + __cloud_env__: { get_param: cloud_env } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml index 2037a57b..3e3cd83e 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml @@ -188,10 +188,10 @@ resources: # __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 } - __demo_artifacts_version__ : { get_param: demo_artifacts_version } - __script_version__ : { get_param: script_version } - __cloud_env__ : { get_param: cloud_env } - __sdnc_ip__ : { get_param: sdnc_ip } + __demo_artifacts_version__: { get_param: demo_artifacts_version } + __script_version__: { get_param: script_version } + __cloud_env__: { get_param: cloud_env } + __sdnc_ip__: { get_param: sdnc_ip } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml index f8db87b2..5b9ce8ec 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml @@ -185,7 +185,7 @@ resources: type: OS::Neutron::Port properties: network: { get_param: mux_gw_private_net_id } - fixed_ips: [{"subnet": { get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_2 }}] + fixed_ips: [{"subnet": { get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgmux_private_ip_2 }}] vgmux_0: type: OS::Nova::Server @@ -204,16 +204,16 @@ resources: user_data: str_replace: params: - __mux_to_bng_net_ipaddr__ : { get_param: vgmux_private_ip_0 } - __oam_ipaddr__ : { get_param: vgmux_private_ip_1 } - __mux_gw_net_ipaddr__ : { get_param: vgmux_private_ip_2 } - __bng_to_mux_ipaddr__ : { get_param: bng_gmux_private_ip } - __bng_mux_net_cidr__ : { get_param: bng_gmux_private_net_cidr } - __oam_cidr__ : { get_param: onap_private_net_cidr } - __mux_gw_net_cidr__ : { get_param: mux_gw_private_net_cidr } - __brg_bng_net_cidr__ : { get_param: brgemu_bng_private_net_cidr } - __script_version__ : { get_param: script_version } - __cloud_env__ : { get_param: cloud_env } + __mux_to_bng_net_ipaddr__: { get_param: vgmux_private_ip_0 } + __oam_ipaddr__: { get_param: vgmux_private_ip_1 } + __mux_gw_net_ipaddr__: { get_param: vgmux_private_ip_2 } + __bng_to_mux_ipaddr__: { get_param: bng_gmux_private_ip } + __bng_mux_net_cidr__: { get_param: bng_gmux_private_net_cidr } + __oam_cidr__: { get_param: onap_private_net_cidr } + __mux_gw_net_cidr__: { get_param: mux_gw_private_net_cidr } + __brg_bng_net_cidr__: { get_param: brgemu_bng_private_net_cidr } + __script_version__: { get_param: script_version } + __cloud_env__: { get_param: cloud_env } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash diff --git a/heat/vCPE/vgw/base_vcpe_vgw.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml index 74fa490b..50cb44c1 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw.yaml +++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml @@ -205,13 +205,13 @@ resources: user_data: str_replace: params: - __mux_gw_private_net_ipaddr__ : { get_param: vgw_private_ip_0 } - __oam_ipaddr__ : { get_param: vgw_private_ip_1 } - __oam_cidr__ : { get_param: onap_private_net_cidr } - __cpe_public_net_cidr__ : { get_param: cpe_public_net_cidr } - __mux_gw_private_net_cidr__ : { get_param: mux_gw_private_net_cidr } - __script_version__ : { get_param: script_version } - __cloud_env__ : { get_param: cloud_env } + __mux_gw_private_net_ipaddr__: { get_param: vgw_private_ip_0 } + __oam_ipaddr__: { get_param: vgw_private_ip_1 } + __oam_cidr__: { get_param: onap_private_net_cidr } + __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr } + __mux_gw_private_net_cidr__: { get_param: mux_gw_private_net_cidr } + __script_version__: { get_param: script_version } + __cloud_env__: { get_param: cloud_env } __mux_ip_addr__: { get_param: mux_ip_addr } __vg_vgmux_tunnel_vni__: { get_param: vg_vgmux_tunnel_vni } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } @@ -240,4 +240,3 @@ resources: cd /opt chmod +x v_gw_install.sh ./v_gw_install.sh - |