components/ruby/puppet-modules/openstack-neutron/patches/04-vpnaas.patch
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--
23146903 Puppet and OpenStack modules need modification notices
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5642
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
     1
In-house patch to allow the vpnaas agent to configure the Solaris driver properties
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
     2
Currently unsuitable for upsteam 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/vpnaas.pp.orig	2016-04-21 08:22:00.590665221 -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/vpnaas.pp	2016-04-21 08:22:13.759565285 -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
 #
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5642
diff changeset
    12
 # Copyright (C) 2013 eNovance SAS <[email protected]>
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5642
diff changeset
    13
 #
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5642
diff changeset
    14
@@ -43,6 +47,12 @@
5642
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    15
 # [*ipsec_status_check_interval*]
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    16
 #   (optional) Status check interval. Defaults to '60'.
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
+# [*packet_logging*]
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    19
+#   (optional) For the Solaris driver, enable logging discarded packets.
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    20
+#
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    21
+# [*logger_level*]
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    22
+#   (optional) For the Solaris driver, the level at which to log discarded packets.
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    23
+#
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    24
 class neutron::agents::vpnaas (
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    25
   $package_ensure              = present,
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    26
   $enabled                     = true,
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5642
diff changeset
    27
@@ -50,7 +60,9 @@
5642
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    28
   $vpn_device_driver           = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    29
   $interface_driver            = 'neutron.agent.linux.interface.OVSInterfaceDriver',
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    30
   $external_network_bridge     = undef,
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    31
-  $ipsec_status_check_interval = '60'
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    32
+  $ipsec_status_check_interval = '60',
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    33
+  $packet_logging              = undef,
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    34
+  $logger_level                = undef
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    35
 ) {
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
   include ::neutron::params
5860
afd31ba91ee9 23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents: 5642
diff changeset
    38
@@ -66,6 +78,15 @@
5642
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    39
         name   => $::neutron::params::openswan_package,
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    40
       }
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    41
     }
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    42
+
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    43
+    /\.SolarisIPsecDriver$/ {
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    44
+      neutron_vpnaas_agent_config {
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    45
+        'solaris/ipsec_status_check_interval': value => $ipsec_status_check_interval;
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    46
+        'solaris/packet_logging':              value => $packet_logging;
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    47
+        'solaris/logger_level':                value => $logger_level;
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    48
+      }
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    49
+    }
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    50
+
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    51
     default: {
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    52
       fail("Unsupported vpn_device_driver ${vpn_device_driver}")
6758c401e924 PSARC/2016/130 Solaris OpenStack Puppet Extensions
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
diff changeset
    53
     }