fix: more wildfly removals

99744c5d · Stefan E. Funk · 2f4c9417 · 99744c5d · 99744c5d · 99744c5d
Commit 99744c5d authored 1 month ago by Stefan E. Funk
--- a/manifests/docker/compose_dariahrep.pp
+++ b/manifests/docker/compose_dariahrep.pp
@@ -65,7 +65,6 @@ class dhrep::docker::compose_dariahrep (
  include dhrep::services::fits
  include dhrep::services::publikator
  include dhrep::services::intern::elasticsearch
-  include dhrep::services::intern::wildfly

  $_crud_image_name = $::dhrep::services::crud::image_name
  $_crud_image_tag = $::dhrep::services::crud::image_tag
@@ -85,8 +84,6 @@ class dhrep::docker::compose_dariahrep (
  $_publikator_image_tag = $dhrep::services::publikator::image_tag
  $_elasticsearch_image_name = $::dhrep::services::intern::elasticsearch::docker_image_name
  $_elasticsearch_image_tag = $::dhrep::services::intern::elasticsearch::docker_image_tag
-  $_wildfly_image_name = $dhrep::services::intern::wildfly::image_name
-  $_wildfly_image_tag = $dhrep::services::intern::wildfly::image_tag

  include dhrep::docker
  file { '/opt/dariahrep':
@@ -116,8 +113,6 @@ class dhrep::docker::compose_dariahrep (
        elasticsearch_image        => "${_elasticsearch_image_name}:${_elasticsearch_image_tag}",
        elasticsearch_config       => $::dhrep::params::config['elasticsearch'],
        elasticsearch_cluster_name => $dhrep::services::intern::elasticsearch::cluster_name,
-        wildfly_image              => "${docker_image_registry}/${_wildfly_image_name}:${_wildfly_image_tag}",
-        wildfly_config             => $::dhrep::params::config['wildfly'],
        # flags for new release, such as es7, java17, and new messaging related changes!
        es_sieben_active           => $::dhrep::services::intern::elasticsearch::es_sieben_active,
    }),
@@ -169,11 +164,6 @@ class dhrep::docker::compose_dariahrep (
    image_tag => $_elasticsearch_image_tag,
    before    => Docker_compose['dariahrep'],
  }
-  dhrep::docker::image { "${docker_image_registry}/${_wildfly_image_name}":
-    ensure    => latest,
-    image_tag => $_wildfly_image_tag,
-    before    => Docker_compose['dariahrep'],
-  }

  docker_compose { 'dariahrep':
    ensure        => present,

--- a/manifests/docker/compose_textgrid.pp
+++ b/manifests/docker/compose_textgrid.pp
@@ -69,7 +69,6 @@ class dhrep::docker::compose_textgrid (
  include dhrep::services::fits
  include dhrep::services::intern::elasticsearch
  include dhrep::services::intern::sesame
-  include dhrep::services::intern::wildfly

  $_crud_image_name = $::dhrep::services::crud::image_name
  $_crud_image_tag = $::dhrep::services::crud::image_tag
@@ -91,8 +90,6 @@ class dhrep::docker::compose_textgrid (
  $_elasticsearch_image_tag = $::dhrep::services::intern::elasticsearch::docker_image_tag
  $_rdf4j_image_name = $dhrep::services::intern::sesame::docker_image_name
  $_rdf4j_image_tag = $dhrep::services::intern::sesame::docker_image_tag
-  $_wildfly_image_name = $dhrep::services::intern::wildfly::image_name
-  $_wildfly_image_tag = $dhrep::services::intern::wildfly::image_tag

  include dhrep::docker
  file { '/opt/textgrid':
@@ -126,8 +123,6 @@ class dhrep::docker::compose_textgrid (
        elasticsearch_cluster_name => $dhrep::services::intern::elasticsearch::cluster_name,
        rdf4j_image                => "${docker_image_registry}/${_rdf4j_image_name}:${_rdf4j_image_tag}",
        rdf4j_config               => $::dhrep::params::config['tomcat_sesame'],
-        wildfly_image              => "${docker_image_registry}/${_wildfly_image_name}:${_wildfly_image_tag}",
-        wildfly_config             => $::dhrep::params::config['wildfly'],
        datadir                    => $::dhrep::services::intern::tgdatadirs::docker_data_location,
        public_hostname            => $::dhrep::public_hostname,
        es_workhorse_active        => ! $::dhrep::services::intern::elasticsearch::one_node_cluster,
@@ -187,11 +182,6 @@ class dhrep::docker::compose_textgrid (
    image_tag => $_rdf4j_image_tag,
    before    => Docker_compose['textgrid'],
  }
-  dhrep::docker::image { "${docker_image_registry}/${_wildfly_image_name}":
-    ensure    => latest,
-    image_tag => $_wildfly_image_tag,
-    before    => Docker_compose['textgrid'],
-  }

  docker_compose { 'textgrid':
    ensure        => present,

--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -151,9 +151,6 @@ class dhrep (
  class { 'dhrep::services::intern::messaging':
    scope => $scope,
  }
-  class { 'dhrep::services::intern::wildfly':
-    scope => $scope,
-  }
  class { 'dhrep::services::iiifmd':
    scope => $scope,
  }
@@ -191,14 +188,14 @@ class dhrep (
      publish_secret => $tgcrud_publish_secret,
      log_level      => $crud_log_level,
      require        => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::sesame'],
-      Class['dhrep::services::intern::wildfly']],
+      Class['dhrep::services::intern::messaging']],
    }
    class { 'dhrep::services::crud_public':
      scope     => $scope,
      location  => $tgcrud_public_location,
      log_level => $crud_public_log_level,
      require   => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::sesame'],
-      Class['dhrep::services::intern::wildfly'], Class['dhrep::services::fits']],
+      Class['dhrep::services::intern::messaging'], Class['dhrep::services::fits']],
    }
    class { 'dhrep::services::publish':
      scope        => $scope,
@@ -238,7 +235,7 @@ class dhrep (
      storage_host_public => $dhcrud_storage_host_public,
      pid_secret          => $dhcrud_pid_secret,
      log_level           => $crud_log_level,
-      require             => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::wildfly'],  Class['dhrep::services::fits']],
+      require             => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::messaging'], Class['dhrep::services::fits']],
    }
    class { 'dhrep::services::crud_public':
      scope               => $scope,
@@ -247,7 +244,7 @@ class dhrep (
      storage_host_public => $dhcrud_public_storage_host_public,
      pid_secret          => $dhcrud_pid_secret,
      log_level           => $crud_public_log_level,
-      require             => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::wildfly']],
+      require             => [Class['dhrep::services::intern::elasticsearch'], Class['dhrep::services::intern::messaging']],
    }
    class { 'dhrep::services::publish':
      scope         => $scope,

--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -227,8 +227,7 @@ class dhrep::params {
  ###
  # memory profiles: if no hiera entry is found, default to undef, so default
  # profile is used
-  # NOTE all tomcats except the crud, publish, and wildfly ones are using the
-  # servicetomcat's settings!
+  # NOTE all tomcats except crud and publish are using the servicetomcat's settings!
  ###
  case hiera('dhrep::mem_profile', undef) {
    'low': {
@@ -254,10 +253,6 @@ class dhrep::params {
          'xmx' => '64m',
          'xms' => '32m',
        },
-        'wildfly' => {
-          'xmx' => '128m',
-          'xms' => '64m',
-        },
        'iiifmd'  => {
          'xmx' => '64m',
          'xms' => '32m',
@@ -307,10 +302,6 @@ class dhrep::params {
          'xmx' => '1792m',
          'xms' => '1792m',
        },
-        'wildfly' => {
-          'xmx' => '256m',
-          'xms' => '256m',
-        },
        'iiifmd'  => {
          'xmx' => '512m',
          'xms' => '512m',
@@ -360,10 +351,6 @@ class dhrep::params {
          'xmx' => '256m',
          'xms' => '32m',
        },
-        'wildfly' => {
-          'xmx' => '256m',
-          'xms' => '32m',
-        },
        'iiifmd'  => {
          'xmx' => '128m',
          'xms' => '32m',
@@ -413,10 +400,6 @@ class dhrep::params {
          'xmx' => '256m',
          'xms' => '32m',
        },
-        'wildfly' => {
-          'xmx' => '384m',
-          'xms' => '32m',
-        },
        'iiifmd'  => {
          'xmx' => '512m',
          'xms' => '32m',

--- a/manifests/tools/scripts.pp
+++ b/manifests/tools/scripts.pp
@@ -26,7 +26,6 @@ class dhrep::tools::scripts (
    owner   => 'root',
    group   => 'root',
    mode    => '0755',
-    #require => [File[$_optdir], Class['::dhrep::services::intern::wildfly'], Class['::dhrep::services::intern::elasticsearch']],
    require => File[$_optdir],
  }


--- a/templates/etc/dhrep/crud-public/dariah/crud.properties.erb
+++ b/templates/etc/dhrep/crud-public/dariah/crud.properties.erb
@@ -152,12 +152,6 @@ PUBLISH_SECRET = *

 # Settings for the message producer.
 USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
 MESSAGING_SERVICE_URL = <%= @messaging_url %>
 MESSAGING_EVENT_NAME = dhcrud-events
 MESSAGING_USER = <%= @messaging_user %>

--- a/templates/etc/dhrep/crud-public/textgrid/crud.properties.erb
+++ b/templates/etc/dhrep/crud-public/textgrid/crud.properties.erb
@@ -114,12 +114,6 @@ REINDEX_SECRET = <%= @reindex_secret %>

 # Settings for the message producer.
 USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
 MESSAGING_SERVICE_URL = <%= @messaging_url %>
 MESSAGING_EVENT_NAME = tgcrud-events
 MESSAGING_USER = <%= @messaging_user %>

--- a/templates/etc/dhrep/crud/dariah/crud.properties.erb
+++ b/templates/etc/dhrep/crud/dariah/crud.properties.erb
@@ -152,12 +152,6 @@ PUBLISH_SECRET = *

 # Settings for the message producer.
 USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
 MESSAGING_SERVICE_URL = <%= @messaging_url %>
 MESSAGING_EVENT_NAME = dhcrud-events
 MESSAGING_USER = <%= @messaging_user %>

--- a/templates/etc/dhrep/crud/textgrid/crud.properties.erb
+++ b/templates/etc/dhrep/crud/textgrid/crud.properties.erb
@@ -114,12 +114,6 @@ REINDEX_SECRET = <%= @reindex_secret %>

 # Settings for the message producer.
 USE_MESSAGING = <%= @use_messaging %>
-# OLD SETTINGS! (prod and test)
-INITIAL_MESSAGING_CONTEXT_FACTORY = org.jboss.naming.remote.client.InitialContextFactory
-MESSAGING_PROVIDER_URL = http-remoting://wildfly:18080
-MESSAGING_SECURITY_PRINCIPAL = tgcrud
-MESSAGING_SECURITY_CREDENTIALS = secret
-# NEW SETTINGS! (dev)
 MESSAGING_SERVICE_URL = <%= @messaging_url %>
 MESSAGING_EVENT_NAME = tgcrud-events
 MESSAGING_USER = <%= @messaging_user %>

--- a/templates/opt/compose-dariahrep/docker-compose.yml.epp
+++ b/templates/opt/compose-dariahrep/docker-compose.yml.epp
@@ -271,8 +271,6 @@ volumes:
      type: none
      device: /var/dhrep/digilib/prescale
      o: bind
-  wildfly_config:
-  wildfly_data:
  crud_tmp:

 networks:

--- a/templates/opt/compose-textgrid/docker-compose.yml.epp
+++ b/templates/opt/compose-textgrid/docker-compose.yml.epp
@@ -341,8 +341,6 @@ volumes:
      device: <%= $datadir %>
      o: bind
  rdf4j_data:
-  wildfly_config:
-  wildfly_data:

 networks:
  dhrepnet1: