From 9a96f371f290fdf8530239a4c0df591527fe636f Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 8 Mar 2016 16:19:04 -0500 Subject: Migrating to Mitaka - Only support for NOSDN for this patch - Other SDN controllers will not be tested for this patch - AODH is now upstream and not needed to be carried in Apex - puppet-cinder-quota-fix.patch is now upstream and not needed to be carried in Apex - puppet-neutron-force-metadata.patch is now upstream and not needed to be carried in Apex - removing the catalog of nic files and creating a templatization for them JIRA: APEX-108 JIRA: APEX-93 JIRA: APEX-92 Change-Id: Ic1a24baec7ef295e9dc1b8b72ac36ca5b05578ea Signed-off-by: Dan Radez --- build/nics-compute.yaml.template | 203 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 build/nics-compute.yaml.template (limited to 'build/nics-compute.yaml.template') diff --git a/build/nics-compute.yaml.template b/build/nics-compute.yaml.template new file mode 100644 index 00000000..86f3972a --- /dev/null +++ b/build/nics-compute.yaml.template @@ -0,0 +1,203 @@ +#!/bin/bash +if [[ $nics_cfg == *_private* ]]; then + private_net=$( cat << END + + - + # Create a bridge which can also be used for VLAN-mode bridge mapping + type: ovs_bridge + name: br-tenant + use_dhcp: false + addresses: + - + ip_netmask: {get_param: TenantIpSubnet} + members: + - + type: interface + name: nic2 + use_dhcp: false + # force the MAC address of the bridge to this interface + primary: true +END +) +fi + +if [[ $nics_cfg == *_storage* ]]; then + storage_net=$( cat << END + - + type: interface + name: nic4 + use_dhcp: false + addresses: + - + ip_netmask: {get_param: StorageIpSubnet} +END +) +fi + +if [[ $nics_cfg == *_br-ex* ]]; then + br_ex=$( cat << END + + members: + - + type: interface + name: nic3 + # force the MAC address of the bridge to this interface + primary: true + +END +) + nic3=$( cat << END + + - + type: ovs_bridge + name: {get_input: bridge_name} +END +) +else + nic3=$( cat << END + + - + type: interface + name: nic3 + +END +) +fi + +if [[ $nics_cfg == *_no-public-ip* ]]; then + if [[ $nics_cfg == *_br-ex* ]]; then + nic3+=$( cat << END + + use_dhcp: false +END +) + else + nic3="" + fi +else + nic3+=$( cat << END + + use_dhcp: false + addresses: + - + ip_netmask: {get_param: ExternalIpSubnet} + routes: + - + ip_netmask: 0.0.0.0/0 + next_hop: {get_param: ExternalInterfaceDefaultRoute} +END +) +fi + +cat < + Software Config to drive os-net-config to configure multiple interfaces + for the compute 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 + StorageMgmtNetworkVlanID: + default: 40 + description: Vlan ID for the storage mgmt network traffic. + type: number + 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 + 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: + - + 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} + - + default: true + next_hop: {get_param: ControlPlaneDefaultRoute}$private_net$nic3$br_ex +$storage_net +outputs: + OS::stack_id: + description: The OsNetConfigImpl resource. + value: {get_resource: OsNetConfigImpl} +END -- cgit 1.2.3-korg