| author | Patrick Einheber <patrick.einheber@oracle.com> |
| Wed, 27 Apr 2016 14:55:10 -0700 | |
| changeset 5860 | afd31ba91ee9 |
| parent 5642 | 6758c401e924 |
| child 6817 | e4a26f447d0c |
| permissions | -rw-r--r-- |
|
5642
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
1 |
In-house patch for Solaris L3 agent driver configuration variables. |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
2 |
This patch is not currently suitable for upstream contribution. |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
4 |
--- openstack-neutron-6.1.0/manifests/agents/l3.pp.orig 2016-04-21 08:23:04.952418874 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
5 |
+++ openstack-neutron-6.1.0/manifests/agents/l3.pp 2016-04-21 08:23:19.798506700 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
6 |
@@ -1,3 +1,7 @@ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
7 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
8 |
+# Oracle has modified the originally distributed contents of this file. |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
9 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
10 |
+ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
11 |
# == Class: neutron::agents::l3 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
12 |
# |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
13 |
# Installs and configures the Neutron L3 service |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
14 |
@@ -99,6 +103,14 @@ |
|
5642
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
15 |
# 'dvr_snat': enable DVR with centralized SNAT support (DVR for single-host, for testing only) |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
16 |
# Defaults to 'legacy' |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
17 |
# |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
18 |
+# [*ra_confs*] |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
19 |
+# (optional) Path to store IPv6 RA config files. |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
20 |
+# Defaults to undef |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
21 |
+# |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
22 |
+# [*allow_forwarding*] |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
23 |
+# (optional) For the Solaris l3 agent, allow forwarding between tenant's networks. |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
24 |
+# Defaults to undef |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
25 |
+# |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
26 |
# [*allow_automatic_l3agent_failover*] |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
27 |
# DEPRECATED: Has no effect in this class. Use the same parameter in neutron::server instead. |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
28 |
# |
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5642
diff
changeset
|
29 |
@@ -161,6 +173,9 @@ |
|
5642
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
30 |
'DEFAULT/enable_metadata_proxy': value => $enable_metadata_proxy; |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
31 |
'DEFAULT/router_delete_namespaces': value => $router_delete_namespaces; |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
32 |
'DEFAULT/agent_mode': value => $agent_mode; |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
33 |
+ 'DEFAULT/ra_confs': value => $ra_confs; |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
34 |
+ 'DEFAULT/allow_forwarding_between_networks': |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
35 |
+ value => $allow_forwarding; |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
36 |
} |
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
37 |
|
|
6758c401e924
PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff
changeset
|
38 |
if $network_device_mtu {
|