diff options
| -rw-r--r-- | heat/vLB/base_vlb_openstack.yaml | 34 | ||||
| -rw-r--r-- | heat/vLB/dnsscaling_openstack.yaml | 27 | ||||
| -rw-r--r-- | vnfs/vLB/scripts/v_dns_install.sh | 7 |
3 files changed, 40 insertions, 28 deletions
diff --git a/heat/vLB/base_vlb_openstack.yaml b/heat/vLB/base_vlb_openstack.yaml index 672c44c9..0db03682 100644 --- a/heat/vLB/base_vlb_openstack.yaml +++ b/heat/vLB/base_vlb_openstack.yaml @@ -252,11 +252,11 @@ resources: #__local_public_ipaddr__: { get_attr: [vlb_floating_ip, floating_ip_address] } __local_private_ipaddr__: { get_param: vlb_private_ip_0 } __oam_private_ipaddr__: { get_param: vlb_private_ip_1 } - __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 } + __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 @@ -292,11 +292,11 @@ resources: 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_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network_id: { get_param: public_net_id } - port_id: { get_resource: vdns_private_1_port } +# vdns_floating_ip: +# type: OS::Neutron::FloatingIP +# properties: +# floating_network_id: { get_param: public_net_id } +# port_id: { get_resource: vdns_private_1_port } vdns_0: type: OS::Nova::Server @@ -314,14 +314,15 @@ resources: user_data: str_replace: params: - __lb_oam_int__ : { get_param: vlb_private_ip_1 } + __lb_oam_int__: { get_param: vlb_private_ip_1 } __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } __local_private_ipaddr__: { get_param: vdns_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 } + __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } + __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 @@ -330,6 +331,7 @@ resources: echo "__lb_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 "__oam_private_ipaddr__" > /opt/config/oam_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 diff --git a/heat/vLB/dnsscaling_openstack.yaml b/heat/vLB/dnsscaling_openstack.yaml index b9dc41a2..f184c079 100644 --- a/heat/vLB/dnsscaling_openstack.yaml +++ b/heat/vLB/dnsscaling_openstack.yaml @@ -151,11 +151,11 @@ resources: 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_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network_id: { get_param: public_net_id } - port_id: { get_resource: vdns_private_1_port } +# vdns_floating_ip: +# type: OS::Neutron::FloatingIP +# properties: +# floating_network_id: { get_param: public_net_id } +# port_id: { get_resource: vdns_private_1_port } vdns_0: type: OS::Nova::Server @@ -165,21 +165,23 @@ resources: name: { get_param: vdns_name_0 } key_name: { get_resource: my_keypair } networks: - - port: { get_resource: vdns_private_1_port } + - network: { get_param: public_net_id } - port: { get_resource: vdns_private_0_port } + - port: { get_resource: vdns_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: - __lb_oam_int__ : { get_param: vlb_private_ip_1 } + __lb_oam_int__: { get_param: vlb_private_ip_1 } __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } __local_private_ipaddr__: { get_param: vdns_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 } + __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } + __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 @@ -188,6 +190,7 @@ resources: echo "__lb_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 "__oam_private_ipaddr__" > /opt/config/oam_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 diff --git a/vnfs/vLB/scripts/v_dns_install.sh b/vnfs/vLB/scripts/v_dns_install.sh index 5e1d55bf..78c992f8 100644 --- a/vnfs/vLB/scripts/v_dns_install.sh +++ b/vnfs/vLB/scripts/v_dns_install.sh @@ -17,7 +17,14 @@ then echo " address $VDNS_PRIVATE_IP_O" >> /etc/network/interfaces echo " netmask 255.255.255.0" >> /etc/network/interfaces + VDNS_PRIVATE_IP_1=$(cat /opt/config/oam_private_ipaddr.txt) + echo "auto eth2" >> /etc/network/interfaces + echo "iface eth2 inet static" >> /etc/network/interfaces + echo " address $VDNS_PRIVATE_IP_1" >> /etc/network/interfaces + echo " netmask 255.255.255.0" >> /etc/network/interfaces + ifup eth1 + ifup eth2 fi # Download required dependencies |