Merge changes from topics 'fix_dpdk', 'vlan_support'

* changes:
  Fixes IP failure during os-collect-config ping check
  Adding VLAN support

1 files changed, 238 insertions, 0 deletions

diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
new file mode 100644
index 00000000..a0333149
--- /dev/null
+++ b/build/nics-template.yaml.jinja2
@@ -0,0 +1,238 @@
+heat_template_version: 2015-04-30
+
+description: >
+  Software Config to drive os-net-config to configure multiple interfaces
+  for the {{ role }} role.
+
+parameters:
+  ControlPlaneIp:
+    default: ''
+    description: IP address/subnet on the ctlplane network
+    type: string
+  ExternalIpSubnet:
+    default: ''
+    description: IP address/subnet on the external network
+    type: string
+  InternalApiIpSubnet:
+    default: ''
+    description: IP address/subnet on the internal API network
+    type: string
+  StorageIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage network
+    type: string
+  StorageMgmtIpSubnet:
+    default: ''
+    description: IP address/subnet on the storage mgmt network
+    type: string
+  TenantIpSubnet:
+    default: ''
+    description: IP address/subnet on the tenant network
+    type: string
+  ManagementIpSubnet: # Only populated when including environments/network-management.yaml
+    default: ''
+    description: IP address/subnet on the management network
+    type: string
+  ExternalNetworkVlanID:
+    default: 10
+    description: Vlan ID for the external network traffic.
+    type: number
+  InternalApiNetworkVlanID:
+    default: 20
+    description: Vlan ID for the internal_api network traffic.
+    type: number
+  StorageNetworkVlanID:
+    default: 30
+    description: Vlan ID for the storage network traffic.
+    type: number
+  StorageMgmtNetworkVlanID:
+    default: 40
+    description: Vlan ID for the storage mgmt network traffic.
+    type: number
+  TenantNetworkVlanID:
+    default: 50
+    description: Vlan ID for the tenant network traffic.
+    type: number
+  ManagementNetworkVlanID:
+    default: 60
+    description: Vlan ID for the management network traffic.
+    type: number
+  ExternalInterfaceDefaultRoute:
+    default: '10.0.0.1'
+    description: default route for the external network
+    type: string
+  ControlPlaneSubnetCidr: # Override this via parameter_defaults
+    default: '24'
+    description: The subnet CIDR of the control plane network.
+    type: string
+  ControlPlaneDefaultRoute: # Override this via parameter_defaults
+    description: The default route of the control plane network.
+    type: string
+  DnsServers: # Override this via parameter_defaults
+    default: []
+    description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf.
+    type: comma_delimited_list
+  EC2MetadataIp: # Override this via parameter_defaults
+    description: The IP address of the EC2 metadata server.
+    type: string
+
+resources:
+  OsNetConfigImpl:
+    type: OS::Heat::StructuredConfig
+    properties:
+      group: os-apply-config
+      config:
+        os_net_config:
+          network_config:
+            -
+            {%- if vlans['private_network'] != 'native' or vlans['storage_network'] != 'native' or vlans['api_network'] != 'native' %}
+              type: ovs_bridge
+              name: {get_input: bridge_name}
+              members:
+                -
+                  type: interface
+                  name: nic1
+                  # force the MAC address of the bridge to this interface
+                  primary: true
+                {%- if 'public_network' in enabled_networks and vlans['private_network'] != 'native' %}
+                -
+                  type: vlan
+                  vlan_id: {get_param: ExternalNetworkVlanID}
+                  addresses:
+                  -
+                    ip_netmask: {get_param: ExternalIpSubnet}
+                  routes:
+                    -
+                      default: true
+                      next_hop: {get_param: ExternalInterfaceDefaultRoute}
+                {%- endif %}
+                {%- if 'private_network' in enabled_networks and vlans['private_network'] != 'native' %}
+                -
+                  type: vlan
+                  vlan_id: {get_param: TenantNetworkVlanID}
+                  addresses:
+                    -
+                      ip_netmask: {get_param: TenantIpSubnet}
+                {%- endif %}
+                {%- if 'storage_network' in enabled_networks and vlans['storage_network'] != 'native' %}
+                -
+                  type: vlan
+                  vlan_id: {get_param: StorageNetworkVlanID}
+                  addresses:
+                    -
+                      ip_netmask: {get_param: StorageIpSubnet}
+                {%- endif %}
+                {%- if 'api_network' in enabled_networks and vlans['api_network'] != 'native' %}
+                -
+                  type: vlan
+                  vlan_id: {get_param: InternalApiNetworkVlanID}
+                  addresses:
+                    -
+                      ip_netmask: {get_param: InternalApiIpSubnet}
+                {%- endif %}
+            {%- else %}
+              type: interface
+              name: nic1
+            {%- endif %}
+              use_dhcp: false
+              dns_servers: {get_param: DnsServers}
+              addresses:
+                -
+                  ip_netmask:
+                    list_join:
+                      - '/'
+                      - - {get_param: ControlPlaneIp}
+                        - {get_param: ControlPlaneSubnetCidr}
+              routes:
+                -
+                  ip_netmask: 169.254.169.254/32
+                  next_hop: {get_param: EC2MetadataIp}
+                {%- if external_net_af == 6 or role == 'compute' %}
+                -
+                  default: true
+                  next_hop: {get_param: ControlPlaneDefaultRoute}
+                {%- endif %}
+
+            {%- set nic_index = 2 %}
+            {%- if 'private_network' in enabled_networks and vlans['private_network'] == 'native' %}
+            {%- if ovs_dpdk_bridge == 'br-phy' %}
+            -
+              type: ovs_bridge
+              name: {{ ovs_dpdk_bridge }}
+              use_dhcp: false
+              addresses:
+                -
+                  ip_netmask: {get_param: TenantIpSubnet}
+              members:
+                -
+                  type: interface
+                  name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+                  # force the MAC address of the bridge to this interface
+                  primary: true
+            -
+              type: ovs_bridge
+              name: br-tun
+              use_dhcp: false
+            {%- else %}
+            -
+              type: interface
+              name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+              use_dhcp: false
+              addresses:
+                -
+                  ip_netmask: {get_param: TenantIpSubnet}
+            {%- endif %}
+            {%- endif %}
+            {%- if 'public_network' in enabled_networks and external_net_type == 'interface' and vlans['public_network'] == 'native' %}
+            -
+              type: interface
+              name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+              {%- if role == 'controller' %}
+              dns_servers: {get_param: DnsServers}
+              {%- endif %}
+              use_dhcp: false
+              addresses:
+                -
+                  ip_netmask: {get_param: ExternalIpSubnet}
+              routes:
+                -
+                  {%- if role == 'controller' %}
+                  default: true
+                  {%- endif %}
+                  ip_netmask: 0.0.0.0/0
+                  next_hop: {get_param: ExternalInterfaceDefaultRoute}
+            {%- elif 'public_network' in enabled_networks  and external_net_type == 'br-ex' and vlans['public_network'] == 'native' %}
+            -
+              type: ovs_bridge
+              name: {get_input: bridge_name}
+              use_dhcp: false
+              members:
+                -
+                  type: interface
+                  name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+                  # force the MAC address of the bridge to this interface
+                  primary: true
+            {%- endif %}
+            {%- if 'storage_network' in enabled_networks and vlans['storage_network'] == 'native' %}
+            -
+              type: interface
+              name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+              use_dhcp: false
+              addresses:
+                -
+                  ip_netmask: {get_param: StorageIpSubnet}
+            {%- endif %}
+            {%- if 'api_network' in enabled_networks and vlans['api_network'] == 'native' %}
+            -
+              type: interface
+              name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %}
+              use_dhcp: false
+              addresses:
+                -
+                  ip_netmask: {get_param: InternalApiIpSubnet}
+            {%- endif %}
+
+outputs:
+  OS::stack_id:
+    description: The OsNetConfigImpl resource.
+    value: {get_resource: OsNetConfigImpl}