Skip to content
Snippets Groups Projects

Resolve "remove all the new_messaging stuff"

Merged Stefan E. Funk requested to merge 16-remove-all-the-new_messaging-stuff into master
19 files
+ 5
389
Compare changes
  • Side-by-side
  • Inline
Files
19
@@ -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,11 +113,8 @@ 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,
new_messaging => $::dhrep::services::intern::wildfly::new_messaging,
}),
notify => Docker_compose['dariahrep'],
}
@@ -170,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,
Loading