-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/hjensas/ovs-configs
- Loading branch information
Showing
3 changed files
with
304 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| resource_registry: | ||
| OS::TripleO::Controller::Net::SoftwareConfig: /home/stack/templates/network/nic-configs/controller.yaml | ||
| OS::TripleO::Compute::Net::SoftwareConfig: /home/stack/templates/network/nic-configs/compute.yaml | ||
| OS::TripleO::BlockStorage::Net::SoftwareConfig: /usr/share/openstack-tripleo-heat-templates/net-config-noop.yaml | ||
| OS::TripleO::ObjectStorage::Net::SoftwareConfig: /usr/share/openstack-tripleo-heat-templates/net-config-noop.yaml | ||
| OS::TripleO::CephStorage::Net::SoftwareConfig: /usr/share/openstack-tripleo-heat-templates/net-config-noop.yaml | ||
|
|
||
| parameter_defaults: | ||
| InternalApiNetCidr: 172.18.3.0/24 | ||
| TenantNetCidr: 172.18.4.0/24 | ||
| StorageNetCidr: 172.18.6.0/24 | ||
| StorageMgmtNetCidr: 172.18.7.0/24 | ||
| ExternalNetCidr: 172.18.1.0/24 | ||
| InternalApiAllocationPools: [{'start': '172.18.3.11', 'end': '172.18.3.49'}] | ||
| TenantAllocationPools: [{'start': '172.18.4.11', 'end': '172.18.4.49'}] | ||
| StorageAllocationPools: [{'start': '172.18.6.11', 'end': '172.18.6.49'}] | ||
| StorageMgmtAllocationPools: [{'start': '172.18.7.11', 'end': '172.18.7.49'}] | ||
| # Leave room for floating IPs in the External allocation pool | ||
| ExternalAllocationPools: [{'start': '172.18.1.11', 'end': '172.18.1.49'}] | ||
| # Set to the router gateway on the external network | ||
| ExternalInterfaceDefaultRoute: 172.18.1.254 | ||
| # Gateway router for the provisioning network (or Undercloud IP) | ||
| ControlPlaneDefaultRoute: 172.18.0.254 | ||
| # The IP address of the EC2 metadata server. Generally the IP of the Undercloud | ||
| EC2MetadataIp: 172.18.0.1 | ||
| # Define the DNS servers (maximum 2) for the overcloud nodes | ||
| DnsServers: ["8.8.8.8","8.8.4.4"] | ||
| InternalApiNetworkVlanID: 403 | ||
| StorageNetworkVlanID: 406 | ||
| StorageMgmtNetworkVlanID: 407 | ||
| TenantNetworkVlanID: 404 | ||
| ExternalNetworkVlanID: 401 | ||
| # Set to "br-ex" if using floating IPs on native VLAN on bridge br-ex | ||
| NeutronExternalNetworkBridge: "''" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| heat_template_version: 2015-04-30 | ||
|
|
||
| description: > | ||
| Software Config to drive os-net-config with 2 bonded nics on a bridge | ||
| with a VLANs attached 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 | ||
| TenantIpSubnet: | ||
| default: '' | ||
| description: IP address/subnet on the tenant network | ||
| type: string | ||
| BondInterfaceOvsOptions: | ||
| default: '' | ||
| description: The ovs_options string for the bond interface. Set things like | ||
| lacp=active and/or bond_mode=balance-slb using this option. | ||
| type: string | ||
| 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 | ||
| 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 subnet CIDR 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: json | ||
| 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: eth0 | ||
| 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} | ||
| - | ||
| type: ovs_bridge | ||
| name: {get_input: bridge_name} | ||
| members: | ||
| - | ||
| type: interface | ||
| name: eth1 | ||
| - | ||
| type: vlan | ||
| device: eth1 | ||
| vlan_id: {get_param: InternalApiNetworkVlanID} | ||
| addresses: | ||
| - | ||
| ip_netmask: {get_param: InternalApiIpSubnet} | ||
| - | ||
| type: vlan | ||
| device: eth1 | ||
| vlan_id: {get_param: StorageNetworkVlanID} | ||
| addresses: | ||
| - | ||
| ip_netmask: {get_param: StorageIpSubnet} | ||
| - | ||
| type: vlan | ||
| device: eth1 | ||
| vlan_id: {get_param: TenantNetworkVlanID} | ||
| addresses: | ||
| - | ||
| ip_netmask: {get_param: TenantIpSubnet} | ||
|
|
||
| outputs: | ||
| OS::stack_id: | ||
| description: The OsNetConfigImpl resource. | ||
| value: {get_resource: OsNetConfigImpl} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| heat_template_version: 2015-04-30 | ||
|
|
||
| description: > | ||
| Software Config to drive os-net-config with | ||
| with a VLANs attached for the controller 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 | ||
| BondInterfaceOvsOptions: | ||
| default: '' | ||
| description: The ovs_options string for the bond interface. Set things like | ||
| lacp=active and/or bond_mode=balance-slb using this option. | ||
| 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 | ||
| 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 | ||
| 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: json | ||
| 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: eth0 | ||
| use_dhcp: false | ||
| 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: ovs_bridge | ||
| name: {get_input: bridge_name} | ||
| dns_servers: {get_param: DnsServers} | ||
| members: | ||
| - | ||
| type: interface | ||
| name: eth1 | ||
| - | ||
| type: vlan | ||
| device: eth1 | ||
| vlan_id: {get_param: ExternalNetworkVlanID} | ||
| addresses: | ||
| - | ||
| ip_netmask: {get_param: ExternalIpSubnet} | ||
| routes: | ||
| - | ||
| ip_netmask: 0.0.0.0/0 | ||
| next_hop: {get_param: ExternalInterfaceDefaultRoute} | ||
| - | ||
| type: vlan | ||
| device: eth1 | ||
| vlan_id: {get_param: InternalApiNetworkVlanID} | ||
| addresses: | ||
| - | ||
| ip_netmask: {get_param: InternalApiIpSubnet} | ||
| - | ||
| type: vlan | ||
| device: eth1 | ||
| vlan_id: {get_param: StorageNetworkVlanID} | ||
| addresses: | ||
| - | ||
| ip_netmask: {get_param: StorageIpSubnet} | ||
| - | ||
| type: vlan | ||
| device: eth1 | ||
| vlan_id: {get_param: StorageMgmtNetworkVlanID} | ||
| addresses: | ||
| - | ||
| ip_netmask: {get_param: StorageMgmtIpSubnet} | ||
| - | ||
| type: vlan | ||
| device: eth1 | ||
| vlan_id: {get_param: TenantNetworkVlanID} | ||
| addresses: | ||
| - | ||
| ip_netmask: {get_param: TenantIpSubnet} | ||
|
|
||
| outputs: | ||
| OS::stack_id: | ||
| description: The OsNetConfigImpl resource. | ||
| value: {get_resource: OsNetConfigImpl} |