diff --git a/data/common/common.yaml b/data/common/common.yaml --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -3573,7 +3573,7 @@ netbox::version: "3.1.2" netbox::user: netbox -netbox::db::host: localhost +netbox::db::host: db1.internal.admin.swh.network netbox::db::port: 5432 netbox::db::database: netbox netbox::db::username: netbox diff --git a/site-modules/profile/manifests/netbox.pp b/site-modules/profile/manifests/netbox.pp --- a/site-modules/profile/manifests/netbox.pp +++ b/site-modules/profile/manifests/netbox.pp @@ -29,14 +29,6 @@ ensure_packages ('python3-venv') - include ::postgresql::server - - ::postgresql::server::db {$db_database: - user => $db_username, - password => postgresql::postgresql_password($db_username, $db_password), - require => [Class['Postgresql::Server']], - } - class { '::redis' : requirepass => $redis_password, bind => '127.0.0.1', @@ -125,7 +117,6 @@ require => [File['netbox-configuration'], File[$media_directory], Package['python3-venv'], - Postgresql::Server::Db[$db_database], ], notify => Exec['netbox-flag-upgrade-done'], } diff --git a/site-modules/role/manifests/swh_netbox.pp b/site-modules/role/manifests/swh_netbox.pp --- a/site-modules/role/manifests/swh_netbox.pp +++ b/site-modules/role/manifests/swh_netbox.pp @@ -1,7 +1,5 @@ # Netbox template class role::swh_netbox inherits role::swh_server { - include profile::postgresql - include profile::netbox include profile::netbox::reverse_proxy }