diff options
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/ONAP/cloud-config/aaf_install.sh | 19 | ||||
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng.env | 1 | ||||
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng.yaml | 6 | ||||
| -rw-r--r-- | heat/vCPE/vbng/build_vcpe_vbng.env | 1 | ||||
| -rw-r--r-- | heat/vCPE/vbng/build_vcpe_vbng.yaml | 1 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env | 1 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml | 6 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env | 1 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml | 1 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux.yaml | 1 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/build_vcpe_vgmux.yaml | 1 | ||||
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw.yaml | 1 | ||||
| -rw-r--r-- | heat/vCPE/vgw/build_vcpe_vgw.yaml | 1 |
13 files changed, 17 insertions, 24 deletions
diff --git a/heat/ONAP/cloud-config/aaf_install.sh b/heat/ONAP/cloud-config/aaf_install.sh index 2d6657ec..61f23daa 100644 --- a/heat/ONAP/cloud-config/aaf_install.sh +++ b/heat/ONAP/cloud-config/aaf_install.sh @@ -115,6 +115,13 @@ under the License. --> </pluginGroups> +EOF + +if [[ $(cat /opt/config/https_proxy.txt) != "no_proxy" ]]; then + HTTPS_PROXY_HOST=$(cat /opt/config/https_proxy.txt | cut -d ':' -f1) + HTTPS_PROXY_PORT=$(cat /opt/config/https_proxy.txt | cut -d ':' -f2) + + cat >> settings.xml << EOF <!-- proxies | This is a list of proxies which can be used on this machine to connect to the network. | Unless otherwise specified (by system property or command-line switch), the first proxy @@ -127,8 +134,8 @@ under the License. <protocol>http</protocol> <username>proxyuser</username> <password>proxypass</password> - <host>$(cat /opt/config/http_proxy.txt | cut -d ':' -f1)</host> - <port>$(cat /opt/config/http_proxy.txt | cut -d ':' -f2)</port> + <host>$HTTPS_PROXY_HOST</host> + <port>$HTTPS_PROXY_PORT</port> <nonProxyHosts>local.net|some.host.com</nonProxyHosts> </proxy> <proxy> @@ -137,12 +144,16 @@ under the License. <protocol>https</protocol> <username>proxyuser</username> <password>proxypass</password> - <host>$(cat /opt/config/https_proxy.txt | cut -d ':' -f1)</host> - <port>$(cat /opt/config/https_proxy.txt | cut -d ':' -f2)</port> + <host>$HTTPS_PROXY_HOST</host> + <port>$HTTPS_PROXY_PORT</port> <nonProxyHosts>local.net|some.host.com</nonProxyHosts> </proxy> </proxies> +EOF +fi + +cat >> settings.xml << EOF <!-- servers | This is a list of authentication profiles, keyed by the server-id used within the system. diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env index 6d860adb..a29fe632 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.env +++ b/heat/vCPE/vbng/base_vcpe_vbng.env @@ -1,7 +1,6 @@ parameters: vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - compile_state: done public_net_id: PUT THE PUBLIC NETWORK ID HERE brgemu_bng_private_net_id: zdfw1bngin01_private brgemu_bng_private_subnet_id: zdfw1bngin01_sub_private diff --git a/heat/vCPE/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml index 997e4c23..fbdbf8f2 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.yaml +++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml @@ -161,10 +161,6 @@ parameters: type: string label: SDNC IP address description: IP address of the SDNC - compile_state: - type: string - label: Compile State - description: State to compile code or not; included for backwards compatibility ############# # # @@ -250,7 +246,6 @@ resources: __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } - __compile_state__ : { get_param: compile_state } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -272,7 +267,6 @@ resources: echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt - echo "__compile_state__" > /opt/config/compile_state.txt echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script diff --git a/heat/vCPE/vbng/build_vcpe_vbng.env b/heat/vCPE/vbng/build_vcpe_vbng.env index b7e2de05..ba9a2c40 100644 --- a/heat/vCPE/vbng/build_vcpe_vbng.env +++ b/heat/vCPE/vbng/build_vcpe_vbng.env @@ -1,7 +1,6 @@ parameters: vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED) vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - compile_state: build public_net_id: PUT THE PUBLIC NETWORK ID HERE vbng_name_0: zdcpe1cpe01bng01 vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app diff --git a/heat/vCPE/vbng/build_vcpe_vbng.yaml b/heat/vCPE/vbng/build_vcpe_vbng.yaml index eb623f8a..59cc2911 100644 --- a/heat/vCPE/vbng/build_vcpe_vbng.yaml +++ b/heat/vCPE/vbng/build_vcpe_vbng.yaml @@ -101,6 +101,7 @@ parameters: type: string label: Compile State description: State to compile code or not; included for backwards compatibility + default: "done" ############# # # diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env index ce29647b..41b5bfcf 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env @@ -1,7 +1,6 @@ parameters: vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 or vbrg-base-ubuntu-16-04 SUGGESTED) vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - compile_state: done public_net_id: PUT THE PUBLIC NETWORK ID HERE vbrgemu_bng_private_net_id: zdfw1bngin01_private vbrgemu_bng_private_subnet_id: zdfw1bngin01_sub_private diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml index 22970344..e0b6da49 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml @@ -120,10 +120,6 @@ parameters: type: string label: SDNC ip address description: SDNC ip address used to set NAT - compile_state: - type: string - label: Compile State - description: State to compile code or not; included for backwards compatibility ############# # # @@ -201,7 +197,6 @@ resources: __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } __sdnc_ip__ : { get_param: sdnc_ip } - __compile_state__ : { get_param: compile_state } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } template: | #!/bin/bash @@ -216,7 +211,6 @@ resources: echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__sdnc_ip__" > /opt/config/sdnc_ip.txt - echo "__compile_state__" > /opt/config/compile_state.txt echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt # Download and run install script diff --git a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env index 4c9ae439..15035a64 100644 --- a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env +++ b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.env @@ -1,7 +1,6 @@ parameters: vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 or vbrg-base-ubuntu-16-04 SUGGESTED) vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED) - compile_state: build vbrgemu_name_0: zdcpe1cpe01brgemu01 vnf_id: vCPE_Infrastructure_BGREMU_demo_app vf_module_id: vCPE_Customer_BRGEMU diff --git a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml index c5a3332e..e176747f 100644 --- a/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml +++ b/heat/vCPE/vbrgemu/build_vcpe_vbrgemu.yaml @@ -111,6 +111,7 @@ parameters: type: string label: Compile State description: State to compile code or not; included for backwards compatibility + default: "done" ############# # # diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml index 220c88fc..2bbf65c7 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml @@ -237,7 +237,6 @@ resources: if [[ "__script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__script_version__" -o /opt/vcpe-scripts-__script_version__.zip unzip -j /opt/vcpe-scripts-__script_version__.zip -d /opt v_gmux_install.sh - sudo su - cd /opt chmod +x v_gmux_install.sh ./v_gmux_install.sh diff --git a/heat/vCPE/vgmux/build_vcpe_vgmux.yaml b/heat/vCPE/vgmux/build_vcpe_vgmux.yaml index c2bd4f4d..ea007666 100644 --- a/heat/vCPE/vgmux/build_vcpe_vgmux.yaml +++ b/heat/vCPE/vgmux/build_vcpe_vgmux.yaml @@ -206,7 +206,6 @@ resources: if [[ "__script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__install_script_version__" -o /opt/vcpe-scripts-__script_version__.zip unzip -j /opt/vcpe-scripts-__script_version__.zip -d /opt v_gmux_build.sh - sudo su - cd /opt chmod +x v_gmux_build.sh ./v_gmux_build.sh diff --git a/heat/vCPE/vgw/base_vcpe_vgw.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml index e58634c6..5167c0a0 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw.yaml +++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml @@ -236,7 +236,6 @@ resources: if [[ "__script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__script_version__" -o /opt/vcpe-scripts-__script_version__.zip unzip -j /opt/vcpe-scripts-__script_version__.zip -d /opt v_gw_install.sh - sudo su - cd /opt chmod +x v_gw_install.sh ./v_gw_install.sh diff --git a/heat/vCPE/vgw/build_vcpe_vgw.yaml b/heat/vCPE/vgw/build_vcpe_vgw.yaml index a80d1ef3..3bd8532b 100644 --- a/heat/vCPE/vgw/build_vcpe_vgw.yaml +++ b/heat/vCPE/vgw/build_vcpe_vgw.yaml @@ -188,7 +188,6 @@ resources: if [[ "__script_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=vcpe-scripts&e=zip&v=__script_version__" -o /opt/vcpe-scripts-__script_version__.zip unzip -j /opt/vcpe-scripts-__script_version__.zip -d /opt v_gw_build.sh - sudo su - cd /opt chmod +x v_gw_build.sh ./v_gw_build.sh |