This repository has been archived by the owner on Dec 4, 2018. It is now read-only.
forked from zehicle/barclamp-quantum
-
Notifications
You must be signed in to change notification settings - Fork 121
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #108 from VictorLowther/pull-req-fix-ovs-package-i…
…nstall-order #108 Merged by devtool for ArkadyKanevsky
- Loading branch information
Showing
6 changed files
with
88 additions
and
233 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
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
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
127 changes: 18 additions & 109 deletions
127
chef/cookbooks/quantum/templates/default/ovs_quantum_plugin.ini.erb
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 |
|---|---|---|
| @@ -1,118 +1,27 @@ | ||
| [DATABASE] | ||
| # This line MUST be changed to actually run the plugin. | ||
| # Example: | ||
| # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum | ||
| # Replace 127.0.0.1 above with the IP address of the database used by the | ||
| # main quantum server. (Leave it as is if the database runs on this host.) | ||
| #sql_connection = sqlite:// | ||
| sql_connection = <%= @ovs_sql_connection %> | ||
|
|
||
| # Database reconnection retry times - in event connectivity is lost | ||
| # set to -1 implies an infinite retry count | ||
| # sql_max_retries = 10 | ||
| # Database reconnection interval in seconds - in event connectivity is lost | ||
| sql_connection = <%= @sql_connection %> | ||
| sql_idle_timeout = <%= @sql_idle_timeout %> | ||
| sql_max_pool_size = <%= @sql_max_pool_size %> | ||
| sql_min_pool_size = <%= @sql_min_pool_size %> | ||
| reconnect_interval = 2 | ||
|
|
||
| [OVS] | ||
| # (StrOpt) Type of network to allocate for tenant networks. The | ||
| # default value 'local' is useful only for single-box testing and | ||
| # provides no connectivity between hosts. You MUST either change this | ||
| # to 'vlan' and configure network_vlan_ranges below or change this to | ||
| # 'gre' and configure tunnel_id_ranges below in order for tenant | ||
| # networks to provide connectivity between hosts. Set to 'none' to | ||
| # disable creation of tenant networks. | ||
| # | ||
| # Default: tenant_network_type = local | ||
| # Example: tenant_network_type = gre | ||
|
|
||
| # (ListOpt) Comma-separated list of | ||
| # <physical_network>[:<vlan_min>:<vlan_max>] tuples enumerating ranges | ||
| # of VLAN IDs on named physical networks that are available for | ||
| # allocation. All physical networks listed are available for flat and | ||
| # VLAN provider network creation. Specified ranges of VLAN IDs are | ||
| # available for tenant network allocation if tenant_network_type is | ||
| # 'vlan'. If empty, only gre and local networks may be created. | ||
| # | ||
| # Default: network_vlan_ranges = | ||
| # Example: network_vlan_ranges = physnet1:1000:2999 | ||
|
|
||
| <% if @networking_mode == 'vlan' -%> | ||
| tenant_network_type = vlan | ||
| network_vlan_ranges = physnet1:<%= @vlan_start %>:<%= @vlan_end %> | ||
| <% elsif @networking_mode == 'gre' -%> | ||
| tenant_network_type = gre | ||
| tunnel_bridge = <%=@physnet%> | ||
| tunnel_id_ranges = <%= node[:quantum][:network][:gre_start]%>:<%= node[:quantum][:network][:gre_stop]%> | ||
| local_ip = <%= node.address("os_sdn").addr %> | ||
| enable_tunneling = True | ||
| <% else -%> | ||
| tenant_network_type = local | ||
| network_vlan_ranges = physnet1 | ||
|
|
||
| # (BoolOpt) Set to True in the server and the agents to enable support | ||
| # for GRE networks. Requires kernel support for OVS patch ports and | ||
| # GRE tunneling. | ||
| # | ||
| # Default: enable_tunneling = False | ||
|
|
||
| # (ListOpt) Comma-separated list of <tun_min>:<tun_max> tuples | ||
| # enumerating ranges of GRE tunnel IDs that are available for tenant | ||
| # network allocation if tenant_network_type is 'gre'. | ||
| # | ||
| # Default: tunnel_id_ranges = | ||
| # Example: tunnel_id_ranges = 1:1000 | ||
|
|
||
| # Do not change this parameter unless you have a good reason to. | ||
| # This is the name of the OVS integration bridge. There is one per hypervisor. | ||
| # The integration bridge acts as a virtual "patch bay". All VM VIFs are | ||
| # attached to this bridge and then "patched" according to their network | ||
| # connectivity. | ||
| # | ||
| # Default: integration_bridge = br-int | ||
|
|
||
| # Only used for the agent if tunnel_id_ranges (above) is not empty for | ||
| # the server. In most cases, the default value should be fine. | ||
| # | ||
| # Default: tunnel_bridge = br-tun | ||
|
|
||
| # Uncomment this line for the agent if tunnel_id_ranges (above) is not | ||
| # empty for the server. Set local-ip to be the local IP address of | ||
| # this hypervisor. | ||
| # | ||
| # Default: local_ip = | ||
|
|
||
| # (ListOpt) Comma-separated list of <physical_network>:<bridge> tuples | ||
| # mapping physical network names to the agent's node-specific OVS | ||
| # bridge names to be used for flat and VLAN networks. Each bridge must | ||
| # exist, and should have a physical network interface configured as a | ||
| # port. All physical networks listed in network_vlan_ranges on the | ||
| # server should have mappings to appropriate bridges on each agent. | ||
| # | ||
| # Default: bridge_mappings = | ||
| # Example: bridge_mappings = physnet1:br-eth1 | ||
| <% end -%> | ||
| bridge_mappings = physnet1:<%=@physnet%> | ||
|
|
||
| [AGENT] | ||
| # Agent's polling interval in seconds | ||
| polling_interval = 2 | ||
| # Use "sudo quantum-rootwrap /etc/quantum/rootwrap.conf" to use the real | ||
| # root filter facility. | ||
| # Change to "sudo" to skip the filtering and just run the comand directly | ||
| root_helper = sudo | ||
|
|
||
| #----------------------------------------------------------------------------- | ||
| # Sample Configurations. | ||
| #----------------------------------------------------------------------------- | ||
| # | ||
| # 1. With VLANs on eth1. | ||
| # [DATABASE] | ||
| # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum | ||
| # [OVS] | ||
| # network_vlan_ranges = default:2000:3999 | ||
| # tunnel_id_ranges = | ||
| # integration_bridge = br-int | ||
| # bridge_mappings = default:br-eth1 | ||
| # [AGENT] | ||
| # root_helper = sudo | ||
| # Add the following setting, if you want to log to a file | ||
| # | ||
| # 2. With tunneling. | ||
| # [DATABASE] | ||
| # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum | ||
| # [OVS] | ||
| # network_vlan_ranges = | ||
| # tunnel_id_ranges = 1:1000 | ||
| # integration_bridge = br-int | ||
| # tunnel_bridge = br-tun | ||
| # local_ip = 10.0.0.3 | ||
| # [AGENT] | ||
| # root_helper = sudo | ||
|
|
||
| root_helper=sudo <%=@rootwrap_bin%> /etc/quantum/rootwrap.conf |
Oops, something went wrong.