diff options
| -rwxr-xr-x | heat/vFWDT/vFWSNK/base_vfw.env | 2 | ||||
| -rwxr-xr-x | heat/vFWDT/vFWSNK/base_vfw.yaml | 32 | ||||
| -rwxr-xr-x | heat/vFWDT/vPKG/base_vpkg.env | 3 | ||||
| -rwxr-xr-x | heat/vFWDT/vPKG/base_vpkg.yaml | 21 |
4 files changed, 26 insertions, 32 deletions
diff --git a/heat/vFWDT/vFWSNK/base_vfw.env b/heat/vFWDT/vFWSNK/base_vfw.env index bd4bbc28..e8d2a0c9 100755 --- a/heat/vFWDT/vFWSNK/base_vfw.env +++ b/heat/vFWDT/vFWSNK/base_vfw.env @@ -28,8 +28,6 @@ parameters: vf_module_id: vFirewallCL dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases demo_artifacts_version: 1.4.0-SNAPSHOT install_script_version: 1.4.0-SNAPSHOT key_name: vfw_key diff --git a/heat/vFWDT/vFWSNK/base_vfw.yaml b/heat/vFWDT/vFWSNK/base_vfw.yaml index bb2888c2..4c84212f 100755 --- a/heat/vFWDT/vFWSNK/base_vfw.yaml +++ b/heat/vFWDT/vFWSNK/base_vfw.yaml @@ -158,14 +158,9 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_blob: + nexus_artifact_repo: type: string - label: Repository URL - description: URL of the repository that hosts the demo packages - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages + description: Root URL for the Nexus repository for Maven artifacts. install_script_version: type: string label: Installation script version number @@ -265,8 +260,6 @@ resources: params: __dcae_collector_ip__ : { get_param: dcae_collector_ip } __dcae_collector_port__ : { get_param: dcae_collector_port } - __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 } __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 } @@ -276,6 +269,7 @@ resources: __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash @@ -284,8 +278,6 @@ resources: mkdir /opt/config echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.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 "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt @@ -295,10 +287,15 @@ resources: echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__cloud_env__" > /opt/config/cloud_env.txt # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_firewall_install.sh -o /opt/v_firewall_install.sh + apt-get update + apt-get -y install unzip + if [[ "__install_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.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip + unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_firewall_install.sh cd /opt chmod +x v_firewall_install.sh ./v_firewall_install.sh @@ -353,14 +350,13 @@ resources: params: __protected_net_gw__: { get_param: vfw_private_ip_1 } __unprotected_net__: { get_param: unprotected_private_net_cidr } - __repo_url_blob__ : { get_param: repo_url_blob } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __install_script_version__ : { get_param: install_script_version } __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 } __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 } __vsn_private_ip_2__ : { get_param: vsn_private_ip_2 } __protected_private_net_cidr__ : { get_param: protected_private_net_cidr } __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash @@ -369,17 +365,21 @@ resources: mkdir /opt/config echo "__protected_net_gw__" > /opt/config/protected_net_gw.txt echo "__unprotected_net__" > /opt/config/unprotected_net.txt - echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt echo "__vsn_private_ip_2__" > /opt/config/vsn_private_ip_2.txt echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__cloud_env__" > /opt/config/cloud_env.txt # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_sink_install.sh -o /opt/v_sink_install.sh + apt-get update + apt-get -y install unzip + if [[ "__install_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.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip + unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_sink_install.sh cd /opt chmod +x v_sink_install.sh ./v_sink_install.sh diff --git a/heat/vFWDT/vPKG/base_vpkg.env b/heat/vFWDT/vPKG/base_vpkg.env index 08b7a844..a9b13287 100755 --- a/heat/vFWDT/vPKG/base_vpkg.env +++ b/heat/vFWDT/vPKG/base_vpkg.env @@ -24,8 +24,7 @@ parameters: vf_module_id: vTrafficPNG demo_artifacts_version: 1.4.0-SNAPSHOT install_script_version: 1.4.0-SNAPSHOT - repo_url_blob: https://nexus.onap.org/content/sites/raw - repo_url_artifacts: https://nexus.onap.org/content/repositories/releases + nexus_artifact_repo: https://nexus.onap.org key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWDT/vPKG/base_vpkg.yaml b/heat/vFWDT/vPKG/base_vpkg.yaml index c985d861..75e7c7a7 100755 --- a/heat/vFWDT/vPKG/base_vpkg.yaml +++ b/heat/vFWDT/vPKG/base_vpkg.yaml @@ -134,14 +134,9 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_blob: + nexus_artifact_repo: type: string - label: Repository URL - description: URL of the repository that hosts the demo packages - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages + description: Root URL for the Nexus repository for Maven artifacts. install_script_version: type: string label: Installation script version number @@ -257,8 +252,6 @@ resources: __fw_ipaddr__: { get_param: vfw_private_ip_0 } __protected_net_cidr__: { get_param: protected_private_net_cidr } __sink_ipaddr__: { get_param: vsn_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 } __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 } @@ -266,6 +259,7 @@ resources: __vpg_private_ip_2__ : { get_param: vpg_private_ip_2 } __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr } __onap_private_net_cidr__ : { get_param: onap_private_net_cidr } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash @@ -275,8 +269,6 @@ resources: echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt echo "__sink_ipaddr__" > /opt/config/sink_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 "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt @@ -284,10 +276,15 @@ resources: echo "__vpg_private_ip_2__" > /opt/config/vpg_private_ip_2.txt echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__cloud_env__" > /opt/config/cloud_env.txt # Download and run install script - curl -k __repo_url_blob__/org.onap.demo/vnfs/vfw/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh + apt-get update + apt-get -y install unzip + if [[ "__install_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.vfw&a=vfw-scripts&e=zip&v=__install_script_version__" -o /opt/vfw-scripts-__install_script_version__.zip + unzip -j /opt/vfw-scripts-__install_script_version__.zip -d /opt v_packetgen_install.sh cd /opt chmod +x v_packetgen_install.sh ./v_packetgen_install.sh |