summaryrefslogtreecommitdiffstats
path: root/environments/network-environment.yaml
AgeCommit message (Collapse)AuthorFilesLines
2016-11-01Add Neutron network type and VLAN ranges to network-environment.yamlDan Sneddon1-0/+5
The command-line options for Neutron network settings have been deprecated in favor of setting parameter defaults in environment files. This update includes the most common settings which were previously set using CLI options in the sample network-environment.yaml. This should also make it possible to deploy in virtual environments without editing any files, since the network-environment.yaml will include sane defaults. Change-Id: Ieae59dfec287b9e5424a2e560de9f7b1bd598536
2016-08-25Merge "Updates and fixes to NIC config template routes"Jenkins1-12/+16
2016-08-12Remove NeutronEnableTunnelling from templatesBob Fournier1-0/+2
As described in https://bugs.launchpad.net/tripleo/+bug/1532830, the OVS agent no longer uses enable_tunneling, which is controlled by NeutronEnableTunnelling, so this change removes NeutronEnableTunnelling from the Heat templates. This change depends on NeutronEnableTunnelling also being removed from python-tripleoclient and puppet-neutron no longer using the enable_tunneling hieradata. Change-Id: I1ff6902ebd15041fc57ffff20a07455f171a004b Closes-Bug: 1532830 Depends-On: I28d33592374f60cb5222a866efaf9d137aca1c5a Depends-On: I73630653330c67444827f32740c44e9d25b5db31
2016-08-08Updates and fixes to NIC config template routesDan Sneddon1-12/+16
This change adds the ManagementInterfaceDefaultRoute parameter for setting the Management network as the default route in some deployments. Notes were added to indicate that if the Management network is used as the default gateway, then the default route on the control plane should be commented out. The sample network-environment.yaml was modified to include the ManagementInterfaceDefaultRoute, but this is commented out like the rest of the Management network parameters. This change also adds the ControlPlaneDefaultRoute and ExternalInterfaceDefaultRoute to all templates, so that if the networks are customized, the NIC configs can be modified without having to modify the parameters section of the template. The default for the ExternalInterfaceDefaultRoute is '10.0.0.1', and the default for ManagementInterfaceDefaultRoute is set to 'unset'. This change also converts the single-nic-linux-bridge-vlans from DHCP to static IPs on the Control Plane Interface, bringing these templates in line with the rest of the NIC config templates. The parameters needed to be updated in these templates as well. The controller-v6.yaml templates had a default value of "10.0.0.1" for the ExternalInterfaceDefaultRoute. This was confusing, and is now undefined. This change also sets a default gateway on the Control Plane in controller-no-external.yaml templates. Change-Id: I8ea6733fe46902e1baeff4ccfbcd42ecc5a1825f
2016-05-06Merge "Fixes ovs bonding option"Jenkins1-1/+1
2016-04-28Fixes ovs bonding optionRamon Acedo1-1/+1
Default ovs bonding options parameter BondInterfaceOvsOptions was wrongly set to "mode=active-backup" which makes os-net-config fail. This fix changes it to "bond_mode=active-backup". Change-Id: If3eaac6558c1a15ac09b198f90f05f1a77cf794b Closes-Bug: #1576137
2016-03-31Updates ControlPlaneSubnetCidr to be a stringRhys Oxenham1-1/+1
Heat is unable to execute the following join when creating the os-net-config definition (OsNetConfigImpl): addresses: - ip_netmask: list_join: - '/' - - {get_param: ControlPlaneIp} - {get_param: ControlPlaneSubnetCidr} In the default network-environment.yaml environment file the ControlPlaneSubnetCidr is defaulted as a non-string "24", e.g. ControlPlaneSubnetCidr: 24 Resulting in the following error, upon deploymnet: 2016-03-30 22:44:17 [overcloud-Controller-wazxxjc6dq22-2-2ictqfdx2nuo]: CREATE_FAILED Resource CREATE failed: resources.NetworkConfig: Property error: resources.OsNetConfigImpl.properties.config: Items to join must be strings not 24 This patch simply updates the default value to '24', to match other templates. This allows a deployment to succeed as expected. Change-Id: I5f75b02dba5c35a9856c6ceff9cf6c24a0cb56d8
2016-02-24Add a sample network-environment.yaml file to environmentsDan Sneddon1-0/+50
This change adds a sample network-environment.yaml file to the environments. This sample includes pointers to NIC config files, as well as default network subnets and allocation pools. This is meant to be a demonstration of the default settings for a virtual deployment. In a real deployment, the operator would customize the settings here and point to custom NIC config templates. Change-Id: I0288c0680effea06b5f805a0d955e8bbf6152ba6