diff options
| -rw-r--r-- | heat/vLB/dnsscaling.yaml | 10 | ||||
| -rw-r--r-- | vnfs/vCPE/scripts/v_gmux_install.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/heat/vLB/dnsscaling.yaml b/heat/vLB/dnsscaling.yaml index 20718276..60f8bacf 100644 --- a/heat/vLB/dnsscaling.yaml +++ b/heat/vLB/dnsscaling.yaml @@ -147,19 +147,19 @@ resources: public_key: { get_param: pub_key } save_private_key: false - vdns_private_0_port: + vdns_2_private_0_port: type: OS::Neutron::Port properties: network: { get_param: vlb_private_net_id } fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}] - vdns_private_1_port: + vdns_2_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: vdns_private_ip_1 }}] - vdns_0: + vdns_2: type: OS::Nova::Server properties: image: { get_param: vlb_image_name } @@ -168,8 +168,8 @@ resources: key_name: { get_resource: my_keypair } networks: - network: { get_param: public_net_id } - - port: { get_resource: vdns_private_0_port } - - port: { get_resource: vdns_private_1_port } + - port: { get_resource: vdns_2_private_0_port } + - port: { get_resource: vdns_2_private_1_port } metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} user_data_format: RAW user_data: diff --git a/vnfs/vCPE/scripts/v_gmux_install.sh b/vnfs/vCPE/scripts/v_gmux_install.sh index 8aa23069..6c322b55 100644 --- a/vnfs/vCPE/scripts/v_gmux_install.sh +++ b/vnfs/vCPE/scripts/v_gmux_install.sh @@ -323,8 +323,8 @@ EOF cd hc2vpp patch -p1 < ../Hc2vpp-Add-VES-agent-for-vG-MUX.patch p_version_snap=$(cat ves/ves-impl/pom.xml | grep -A 1 "jvpp-ves" | tail -1) -p_version_snap=$(echo "${p_version%<*}") -p_version_snap=$(echo "${p_version#*>}") +p_version_snap=$(echo "${p_version_snap%<*}") +p_version_snap=$(echo "${p_version_snap#*>}") p_version=$(echo "${p_version_snap%-*}") mkdir -p ~/.m2/repository/io/fd/vpp/jvpp-ves/${p_version_snap} mvn install:install-file -Dfile=/usr/share/java/jvpp-ves-${p_version}.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-ves -Dversion=${p_version_snap} -Dpackaging=jar |