diff --git a/manifests/service_vulnerability.pp b/manifests/service_vulnerability.pp index 41cbbbc..d3505d9 100644 --- a/manifests/service_vulnerability.pp +++ b/manifests/service_vulnerability.pp @@ -57,44 +57,6 @@ ], } - podman::quadlet { 'iop-service-vuln-dbupgrade': - ensure => $ensure, - quadlet_type => 'container', - user => 'root', - require => [ - Podman::Network['iop-core-network'], - Postgresql::Server::Db[$database_name], - Iop::Postgresql_fdw['vulnerability'], - ], - settings => { - 'Unit' => { - 'Description' => 'Vulnerability Database Upgrade Init Container', - }, - 'Service' => { - 'Type' => 'oneshot', - 'RemainAfterExit' => 'true', - }, - 'Container' => { - 'Image' => $image, - 'ContainerName' => 'iop-service-vuln-dbupgrade', - 'Network' => 'iop-core-network', - 'Exec' => 'bash -c /engine/dbupgrade.sh', - 'Volume' => [ - '/var/run/postgresql:/var/run/postgresql:rw', - ], - 'Environment' => [ - "POSTGRES_DB=${database_name}", - 'POSTGRES_HOST=/var/run/postgresql', - 'POSTGRES_PORT=5432', - "POSTGRES_USER=${database_user}", - "POSTGRES_PASSWORD=${database_password}", - 'UNLEASH_BOOTSTRAP_FILE=develfeatureflags.json', - 'DISABLE_RBAC=TRUE', - ], - }, - }, - } - podman::quadlet { 'iop-service-vuln-manager': ensure => $ensure, quadlet_type => 'container', @@ -107,14 +69,13 @@ settings => { 'Unit' => { 'Description' => 'Vulnerability Manager Service', - 'After' => ['network-online.target', 'iop-service-vuln-dbupgrade.service'], - 'Requires' => 'iop-service-vuln-dbupgrade.service', + 'After' => ['network-online.target'], }, 'Container' => { 'Image' => $image, 'ContainerName' => 'iop-service-vuln-manager', 'Network' => 'iop-core-network', - 'Exec' => '/engine/entrypoint.sh manager', + 'Exec' => '/engine/entrypoint.sh database-upgrade manager', 'Volume' => [ '/var/run/postgresql:/var/run/postgresql:rw', ], diff --git a/spec/acceptance/service_vulnerability_spec.rb b/spec/acceptance/service_vulnerability_spec.rb index a9ee5b5..bd657c9 100644 --- a/spec/acceptance/service_vulnerability_spec.rb +++ b/spec/acceptance/service_vulnerability_spec.rb @@ -20,10 +20,6 @@ class { 'iop::service_vulnerability': } end end - describe service('iop-service-vuln-dbupgrade') do - it { is_expected.to be_enabled } - end - describe service('iop-service-vuln-manager') do it { is_expected.to be_running } it { is_expected.to be_enabled }