aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-05-18 13:50:48 -0400
committerMarco Platania <platania@research.att.com>2017-05-18 13:50:48 -0400
commit1c79537b57c3c23352abdd9c56840c9a9a5ffa2a (patch)
tree83802018c8a978749bc85873989628a0031b09cd
parentfee6de844f9d4c3aad87733734d35df50117b6b0 (diff)
[UCA-13] Enable DNS recursive queries
Change-Id: Ia0f4ca27a3f0cdd08eb830fc5d4b8c9a03ed0e62 Signed-off-by: Marco Platania <platania@research.att.com>
-rw-r--r--boot/bind_options1
-rw-r--r--boot/dns_install.sh1
-rw-r--r--heat/OpenECOMP/onap_openstack.yaml3
-rw-r--r--heat/OpenECOMP/onap_openstack_float.yaml3
-rw-r--r--heat/OpenECOMP/onap_openstack_nofloat.yaml3
5 files changed, 8 insertions, 3 deletions
diff --git a/boot/bind_options b/boot/bind_options
index 49957325..ed9540a3 100644
--- a/boot/bind_options
+++ b/boot/bind_options
@@ -10,6 +10,7 @@ options {
allow-transfer { none; }; # disable zone transfers by default
forwarders {
+ external_dns
8.8.8.8;
8.8.4.4;
};
diff --git a/boot/dns_install.sh b/boot/dns_install.sh
index 152a723a..58bb4d78 100644
--- a/boot/dns_install.sh
+++ b/boot/dns_install.sh
@@ -64,6 +64,7 @@ curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/named.conf.local
if [[ $CLOUD_ENV != "rackspace" ]]
then
sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/named.conf.options
+ sed -i "s/external_dns/"$(cat /opt/config/external_dns.txt)"/g" /etc/bind/named.conf.options
sed -i "s/aai_ip_addr/"$(cat /opt/config/aai_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
sed -i "s/appc_ip_addr/"$(cat /opt/config/appc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
sed -i "s/dcae_ip_addr/"$(cat /opt/config/dcae_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml
index 7237dee4..375d7816 100644
--- a/heat/OpenECOMP/onap_openstack.yaml
+++ b/heat/OpenECOMP/onap_openstack.yaml
@@ -377,7 +377,7 @@ resources:
__sdnc_ip_addr__: { get_param: sdnc_ip_addr }
__vid_ip_addr__: { get_param: vid_ip_addr }
__cloud_env__: { get_param: cloud_env }
-
+ __external_dns__: { get_param: external_dns }
template: |
#!/bin/bash
@@ -400,6 +400,7 @@ resources:
echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
+ echo "__external_dns__" > /opt/config/external_dns.txt
# Download and run install script
curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml
index 5623e49c..977da801 100644
--- a/heat/OpenECOMP/onap_openstack_float.yaml
+++ b/heat/OpenECOMP/onap_openstack_float.yaml
@@ -447,7 +447,7 @@ resources:
__sdnc_ip_addr__: { get_param: sdnc_ip_addr }
__vid_ip_addr__: { get_param: vid_ip_addr }
__cloud_env__: { get_param: cloud_env }
-
+ __external_dns__: { get_param: external_dns }
template: |
#!/bin/bash
@@ -470,6 +470,7 @@ resources:
echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
+ echo "__external_dns__" > /opt/config/external_dns.txt
# Download and run install script
curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml
index 2eb0c251..b0a155d4 100644
--- a/heat/OpenECOMP/onap_openstack_nofloat.yaml
+++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml
@@ -355,7 +355,7 @@ resources:
__sdnc_ip_addr__: { get_param: sdnc_ip_addr }
__vid_ip_addr__: { get_param: vid_ip_addr }
__cloud_env__: { get_param: cloud_env }
-
+ __external_dns__: { get_param: external_dns }
template: |
#!/bin/bash
@@ -378,6 +378,7 @@ resources:
echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
+ echo "__external_dns__" > /opt/config/external_dns.txt
# Download and run install script
curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ }
tosca_definitions_version: tosca_simple_profile_for_ecomp_1_0

description: Service Template for deploing MME Service

metadata:
  invariantUUID: e255f20c-5331-4245-9ad5-8861a73080b7
  UUID: 7787da18-7516-40cf-bec0-ebd4202c60f0
  type: Service
  name: vMME_Service
  description: vMME_Service
  category: Mobility
  serviceEcompNaming: false
  serviceHoming: false

imports:
  vmmeToscaTemplate:
    file: vf_vmme_template_1.yml
    
topology_template:

  inputs:    
    mme_vf_instance_name:
      type: string
      description: VF instance name
    mme_vf_deployment_node:
      type: string
      description: The target LCP node for deployment of this VF instance
    gtp_net_network_name:
      type: string
      description: The GTP network route targets
      default: MME-24474-Ericsson-WTC-lab_gn_GTP_net_1 # HEAT ENV
    gtp_net_route_targets:
      type: string
      description: The GTP network route targets
      default: "13979:105715" # HEAT ENV
    gtp_net_cidr:
      type: string
      description: The GTP network cidr
      default: 107.243.37.64/27 # HEAT ENV
    gtp_net_gateway_ip:
      type: string
      description: The GTP network gateway
      default: 107.243.37.65 # HEAT ENV
    gtp_net_start_ip:
      type: string
      description: The GTP network start ip
      default: 107.243.37.67 # HEAT ENV
    gtp_net_end_ip:
      type: string
      description: The GTP network end ip
      default: 107.243.37.94 # HEAT ENV
     # more inputs were removed for brevity 
      
  node_templates:

    mme: # vMME VNF
      type: org.openecomp.resource.vf.vmme

      metadata:
          invariantUUID: b8643c59-e2c2-4f86-880d-571d4d9d5d22
          UUID: b020ed1e-4bc7-4fc0-ba7e-cc7af6da7ffc
          version: 1.0
          name: vMME_VF
          description: vMME_VF
          type: VF
          category: Application L4+
          subcategory: Firewall
          resourceVendor: Ericsson

      properties:
        vf_ecomp_name: false
        vf_instance_name: { get_input: vf_instance_name }
        vf_homing: false
        vf_deployment_node: { get_input: vf_deployment_node }

      requirements:
        - vlc1_sctp_a.link:
              capability: tosca.capabilities.network.Bindable
              node: sctp_a_net
              relationship: tosca.relationships.network.BindsTo
        - vlc1_sctp_b.link:
              capability: tosca.capabilities.network.Bindable
              node: sctp_b_net
              relationship: tosca.relationships.network.BindsTo
        - vlc1_gtp_net.link:
              capability: tosca.capabilities.network.Bindable
              node: gtp_net
              relationship: tosca.relationships.network.BindsTo



  # Virtual Links (Networks)

    gtp_net:
      type: org.openecomp.resource.vl.VL
      metadata:
        invariantUUID: ab2995c59-ff34-4f86-a60d-371d4d9d1896
        UUID: 101a0ed2e-a12d-ff20-004e-cc7af4daffc3
        version: 1.0
        name: GTPNet
        description: GTP External Network
        type: VL
        category: VL
        resourceVendor: AT&T
      properties:
        network_type: Tenant_Layer_3
        network_technology: Contrail
        network_ecomp_name: false
        network_homing: false
        network_deployment_node: { get_input : network_deployment_node }
        contrail_virtual_network:
          network_name: {get_input: gtp_net_network_name}
          route_targets: {get_input: gtp_net_route_targets}
        network_id:
        layer_protocol: IP
        flow_pattern: E-LAN
        test_access: none
        l3_access_parameters:
          ip_version: 4
          cidr: {get_input: gtp_net_cidr}
          gateway_ip: {get_input: gtp_net_gateway_ip}
          start_ip: {get_input: gtp_net_start_ip}
          end_ip: {get_input: gtp_net_end_ip}

    sctp_a_net:
      type: org.openecomp.resource.vl.VL
      metadata:
        invariantUUID: 29205c59-1111-4f86-880d-371d4d9dc999
        UUID: 1890ed2e-abcd-3f20-124e-cc7af4da4321
        version: 1.0
        name: SCTPANet
        description: SCTP A External Network
        type: VL
        category: VL
        resourceVendor: AT&T
      properties:
        network_type: Tenant_Layer_3
        network_technology: Contrail
        network_ecomp_name: false
        network_homing: false
        network_deployment_node: { get_input : network_deployment_node }
        contrail_virtual_network:
          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPA_net_1
          route_targets: 13979:105717
        layer_protocol: IP
        flow_pattern: E-LAN
        test_access: none
        l3_access_parameters:
          ip_version: 4
          cidr: 107.243.37.0/27 # HEAT ENV
          gateway_ip: 107.243.37.1 # HEAT ENV
          start_ip: 107.243.37.3 # HEAT ENV
          end_ip: 107.243.37.30 # HEAT ENV

    sctp_b_net:
      type: org.openecomp.resource.vl.VL
      metadata:
        invariantUUID: 89595c59-2134-4f86-880d-371d4d9d12a6
        UUID: 1af0ed2e-abcd-3f20-834e-cc7af4dafc45
        version: 1.0
        name: SCTPBNet
        description: SCTP B External Network
        type: VL
        category: VL
        resourceVendor: AT&T
      properties:
        network_type: Tenant_Layer_3
        network_technology: Contrail
        network_ecomp_name: false
        network_homing: false
        network_deployment_node: { get_input : network_deployment_node }
        contrail_virtual_network:
          network_name: MME-24474-Ericsson-WTC-lab_gn_SCTPB_net_1
          route_targets: 13979:105719
        network_id:
        layer_protocol: IP
        flow_pattern: E-LAN
        test_access: none
        l3_access_parameters:
          ip_version: 4
          cidr: 107.243.37.32/24 # HEAT ENV
          gateway_ip: 107.243.37.33 # HEAT ENV
          start_ip: 107.243.37.35 # HEAT ENV
          end_ip: 107.243.37.62 # HEAT ENV

  groups:

    external_networks: # vMME_External_Network
      type: org.openecomp.groups.externalNetworks
      properties:
        contrail_service_instance: true # from HEAT
        availability_zone_count: 1 # from HEAT
              
      members: [ sctp_a_net, sctp_b_net, gtp_net ]