From aa5194f878bb0c9fb98891abd6005b1b252eff3e Mon Sep 17 00:00:00 2001 From: Michael Henkel Date: Fri, 16 Jun 2017 11:02:59 -0700 Subject: Contrail network realignement + DPDK enablement This patch moves Contrail roles communication from public/external to internal_api network for OpenStack API. It also adds the option to enable dpdk. Monolithic firstboot script is broken down into small pre-network and per-node extraconfig scripts Change-Id: I296a3bf60cef6fa950fd71d6e68effe367d1e66b Closes-Bug: 1698422 --- .../contrail/contrail-nic-config-compute.yaml | 167 --------------------- 1 file changed, 167 deletions(-) delete mode 100644 environments/contrail/contrail-nic-config-compute.yaml (limited to 'environments/contrail/contrail-nic-config-compute.yaml') diff --git a/environments/contrail/contrail-nic-config-compute.yaml b/environments/contrail/contrail-nic-config-compute.yaml deleted file mode 100644 index a5f0ecab..00000000 --- a/environments/contrail/contrail-nic-config-compute.yaml +++ /dev/null @@ -1,167 +0,0 @@ -heat_template_version: pike - -description: > - Software Config to drive os-net-config to configure multiple interfaces - for the compute role. This is an example for a Nova compute node using - Contrail vrouter and the vhost0 interface. - -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 - InternalApiDefaultRoute: # Not used by default in this template - default: '10.0.0.1' - description: The default route of 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 - 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 - ExternalInterfaceDefaultRoute: # Not used by default in this template - default: '10.0.0.1' - description: The default route of the external network. - type: string - ManagementInterfaceDefaultRoute: # Commented out by default in this template - default: unset - description: The default route of the management 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::SoftwareConfig - properties: - group: script - config: - str_replace: - template: - get_file: ../../scripts/run-os-net-config.sh - params: - $network_config: - network_config: - - type: interface - name: nic1 - 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 - - type: interface - name: nic2 - use_dhcp: false - - type: interface - name: vhost0 - use_dhcp: false - addresses: - - ip_netmask: - get_param: InternalApiIpSubnet - routes: - - default: true - next_hop: - get_param: InternalApiDefaultRoute - - type: linux_bridge - name: br0 - use_dhcp: false - members: - - type: interface - name: nic3 - - type: vlan - vlan_id: - get_param: ManagementNetworkVlanID - device: br0 - addresses: - - ip_netmask: - get_param: ManagementIpSubnet - - type: vlan - vlan_id: - get_param: ExternalNetworkVlanID - device: br0 - addresses: - - ip_netmask: - get_param: ExternalIpSubnet - - type: vlan - vlan_id: - get_param: StorageNetworkVlanID - device: br0 - addresses: - - ip_netmask: - get_param: StorageIpSubnet - - type: vlan - vlan_id: - get_param: StorageMgmtNetworkVlanID - device: br0 - addresses: - - ip_netmask: - get_param: StorageMgmtIpSubnet - -outputs: - OS::stack_id: - description: The OsNetConfigImpl resource. - value: - get_resource: OsNetConfigImpl -- cgit 1.2.3-korg