Fix bind IP config for REST

[integration/packaging/puppet-opendaylight.git] / manifests / config.pp

diff --git a/manifests/config.pp b/manifests/config.pp
index 97e182c984369b2c71b778ee1d8f2075be4b14dd..373b8ad688edc9ee1d20eb270ca96c40d762e938 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -20,14 +20,37 @@ class opendaylight::config {
   }
 
   # Configuration of ODL NB REST port to listen on
-  file { 'jetty.xml':
-    ensure  => file,
-    path    => '/opt/opendaylight/etc/jetty.xml',
-    # Set user:group owners
-    owner   => 'odl',
-    group   => 'odl',
-    # Use a template to populate the content
-    content => template('opendaylight/jetty.xml.erb'),
+  augeas {'ODL REST Port':
+    incl    => '/opt/opendaylight/etc/jetty.xml',
+    context => '/files/opt/opendaylight/etc/jetty.xml/Configure',
+    lens    => 'Xml.lns',
+    changes => [
+      "set Call[2]/Arg/New/Set[#attribute[name='port']]/Property/#attribute/default ${opendaylight::odl_rest_port}"]
+  }
+
+  if $opendaylight::odl_bind_ip != '0.0.0.0' {
+    # Configuration of ODL NB REST IP to listen on
+    augeas { 'ODL REST IP':
+      incl    => '/opt/opendaylight/etc/jetty.xml',
+      context => '/files/opt/opendaylight/etc/jetty.xml/Configure',
+      lens    => 'Xml.lns',
+      changes => [
+        "set Call[1]/Arg/New/Set[#attribute[name='host']]/Property/#attribute/default ${opendaylight::odl_bind_ip}",
+        "set Call[2]/Arg/New/Set[#attribute[name='host']]/Property/#attribute/default ${opendaylight::odl_bind_ip}"]
+    }
+
+    file { 'org.ops4j.pax.web.cfg':
+      ensure => file,
+      path   => '/opt/opendaylight/etc/org.ops4j.pax.web.cfg',
+      # Set user:group owners
+      owner  => 'odl',
+      group  => 'odl',
+    }
+    -> file_line { 'org.ops4j.pax.web.cfg':
+      ensure => present,
+      path   => '/opt/opendaylight/etc/org.ops4j.pax.web.cfg',
+      line   => "org.ops4j.pax.web.listening.addresses = ${opendaylight::odl_bind_ip}"
+    }
   }
 
   # Set any custom log levels
@@ -39,25 +62,71 @@ class opendaylight::config {
     }
   }
 
+  # Set maximum ODL log file size
+  file_line { 'logmaxsize':
+    ensure => present,
+    path   => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
+    line   => "log4j.appender.out.maxFileSize=${::opendaylight::log_max_size}",
+    match  => '^log4j.appender.out.maxFileSize.*$'
+  }
+
+  # Set maximum number of ODL log file rollovers to preserve
+  file_line { 'logmaxrollover':
+    ensure => present,
+    path   => '/opt/opendaylight/etc/org.ops4j.pax.logging.cfg',
+    line   => "log4j.appender.out.maxBackupIndex=${::opendaylight::log_max_rollover}",
+    match  => '^log4j.appender.out.maxBackupIndex.*$'
+  }
+
   # Configure ODL HA if enabled
   $ha_node_count = count($::opendaylight::ha_node_ips)
   if $::opendaylight::enable_ha {
     if $ha_node_count >= 2 {
       # Configure ODL OSVDB Clustering
-      $ha_node_ip_str = join($::opendaylight::ha_node_ips, ' ')
-      exec { 'Configure ODL OVSDB Clustering':
-        command => "configure_cluster.sh ${::opendaylight::ha_node_index} ${ha_node_ip_str}",
-        path    => '/opt/opendaylight/bin/:/usr/sbin:/usr/bin:/sbin:/bin',
-        creates => '/opt/opendaylight/configuration/initial/akka.conf'
+      $cluster_config_dir = '/opt/opendaylight/configuration/initial'
+
+      file { $cluster_config_dir:
+        ensure => directory,
+        mode   => '0755',
+        owner  => 'odl',
+        group  => 'odl',
+      }
+
+      file {'akka.conf':
+        ensure  => file,
+        path    => "${cluster_config_dir}/akka.conf",
+        owner   => 'odl',
+        group   => 'odl',
+        content => template('opendaylight/akka.conf.erb'),
+        require => File[$cluster_config_dir]
+      }
+
+      file {'modules.conf':
+        ensure  => file,
+        path    => "${cluster_config_dir}/modules.conf",
+        owner   => 'odl',
+        group   => 'odl',
+        content => template('opendaylight/modules.conf.erb'),
+        require => File[$cluster_config_dir]
       }
+
+      file {'module-shards.conf':
+        ensure  => file,
+        path    => "${cluster_config_dir}/module-shards.conf",
+        owner   => 'odl',
+        group   => 'odl',
+        content => template('opendaylight/module-shards.conf.erb'),
+        require => File[$cluster_config_dir]
+      }
+
     } else {
       fail("Number of HA nodes less than 2: ${ha_node_count} and HA Enabled")
     }
   }
 
-  # Configure ACL security group
-  # Requires at least CentOS 7.3 for RHEL/CentOS systems
-  if ('odl-netvirt-openstack' in $opendaylight::features) {
+  if ('odl-netvirt-openstack' in $opendaylight::features or 'odl-netvirt-sfc' in $opendaylight::features) {
+    # Configure ACL security group
+    # Requires at least CentOS 7.3 for RHEL/CentOS systems
     if $opendaylight::security_group_mode == 'stateful' {
       if defined('$opendaylight::stateful_unsupported') and $opendaylight::stateful_unsupported {
           warning("Stateful is unsupported in ${::operatingsystemrelease} setting to 'learn'")
@@ -89,6 +158,37 @@ class opendaylight::config {
       group   => 'odl',
       content => template('opendaylight/netvirt-aclservice-config.xml.erb'),
     }
+
+    # Configure SNAT
+    file { 'netvirt-natservice-config.xml':
+      ensure  => file,
+      path    => '/opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-natservice-config.xml',
+      owner   => 'odl',
+      group   => 'odl',
+      content => template('opendaylight/netvirt-natservice-config.xml.erb'),
+      require => File['/opt/opendaylight/etc/opendaylight/datastore/initial/config'],
+    }
+  }
+
+  # SFC Config
+  if ('odl-netvirt-sfc' in $opendaylight::features) {
+    file { 'netvirt-elanmanager-config.xml':
+      ensure  => file,
+      path    => '/opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml',
+      owner   => 'odl',
+      group   => 'odl',
+      source  => 'puppet:///modules/opendaylight/netvirt-elanmanager-config.xml',
+      require => File['/opt/opendaylight/etc/opendaylight/datastore/initial/config'],
+    }
+
+    file { 'genius-itm-config.xml':
+      ensure  => file,
+      path    => '/opt/opendaylight/etc/opendaylight/datastore/initial/config/genius-itm-config.xml',
+      owner   => 'odl',
+      group   => 'odl',
+      source  => 'puppet:///modules/opendaylight/genius-itm-config.xml',
+      require => File['/opt/opendaylight/etc/opendaylight/datastore/initial/config'],
+    }
   }
 
   #configure VPP routing node