Skip to content
This repository has been archived by the owner on Jan 30, 2024. It is now read-only.

Configure collections_publisher_db_admin machine class #11353

Merged
merged 1 commit into from
Dec 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
govuk_env_sync::tasks:
"pull_collections_publisher_production_daily":
ensure: "present"
hour: "0"
minute: "0"
action: "pull"
dbms: "mysql"
storagebackend: "s3"
database: "collections_publisher_production"
database_hostname: "collections-publisher-mysql"
temppath: "/tmp/collections_publisher_production"
url: "govuk-production-database-backups"
path: "collections-publisher-mysql"
# "push_collections_publisher_production_daily":
# ensure: "present"
# hour: "5"
# minute: "0"
# action: "push"
# dbms: "mysql"
# storagebackend: "s3"
# database: "collections_publisher_production"
# database_hostname: "collections-publisher-mysql"
# temppath: "/tmp/collections_publisher_production"
# url: "govuk-integration-database-backups"
# path: "collections-publisher-mysql"
13 changes: 13 additions & 0 deletions hieradata_aws/class/production/collections_publisher_db_admin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# govuk_env_sync::tasks:
# "push_collections_publisher_production_daily":
# ensure: "present"
# hour: "23"
# minute: "0"
# action: "push"
# dbms: "mysql"
# storagebackend: "s3"
# database: "collections_publisher_production"
# database_hostname: "collections-publisher-mysql"
# temppath: "/tmp/collections_publisher_production"
# url: "govuk-production-database-backups"
# path: "collections-publisher-mysql"
25 changes: 25 additions & 0 deletions hieradata_aws/class/staging/collections_publisher_db_admin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
govuk_env_sync::tasks:
"pull_collections_publisher_production_daily":
ensure: "present"
hour: "0"
minute: "0"
action: "pull"
dbms: "mysql"
storagebackend: "s3"
database: "collections_publisher_production"
database_hostname: "collections-publisher-mysql"
temppath: "/tmp/collections_publisher_production"
url: "govuk-production-database-backups"
path: "collections-publisher-mysql"
# "push_collections_publisher_production_daily":
# ensure: "present"
# hour: "5"
# minute: "0"
# action: "push"
# dbms: "mysql"
# storagebackend: "s3"
# database: "collections_publisher_production"
# database_hostname: "collections-publisher-mysql"
# temppath: "/tmp/collections_publisher_production"
# url: "govuk-staging-database-backups"
# path: "collections-publisher-mysql"
2 changes: 2 additions & 0 deletions hieradata_aws/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,8 @@ govuk::apps::ckan::s3_aws_secret_access_key: "%{hiera('s3_aws_secret_access_key'

govuk::apps::collections::unicorn_worker_processes: 8

# TODO: switch to "collections-publisher-mysql" and uncomment the 'push'
# `govuk_env_sync::tasks` tasks when we're ready to switch to the dedicated RDS instance
govuk::apps::collections_publisher::db_hostname: "mysql-primary"
govuk::apps::collections_publisher::jwt_auth_secret: "%{hiera('jwt_auth_secret')}"
govuk::apps::collections_publisher::redis_host: "%{hiera('sidekiq_host')}"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unlike the PostgreSQL equivalent, we don't need to set a s_collections_publisher_db_admin::apt_mirror_hostname here, as it isn't used anywhere in the govuk::node::s_collections_publisher_db_admin class.

Expand Down
34 changes: 34 additions & 0 deletions modules/govuk/manifests/node/s_collections_publisher_db_admin.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# == Class: govuk_node::s_collections_db_admin
#
# This machine class is used to administer the Collections Publisher
# MySQL RDS instances.
#
# === Parameters
#
# [*mysql_db_host*]
# The database hostname
#
# [*mysql_db_password*]
# The database password
#
# [*mysql_db_user*]
# The database user to connect to the remote database as
#
class govuk::node::s_collections_publisher_db_admin(
$mysql_db_host = undef,
$mysql_db_password = undef,
$mysql_db_user = undef,
) {
include ::govuk::node::s_base
include govuk_env_sync

file { '/root/.my.cnf':
ensure => 'present',
owner => 'root',
group => 'root',
content => template('govuk/mysql_my.cnf.erb'),
}

# include all MySQL classes that create databases and users
-> class { '::govuk::apps::collections_publisher::db': }
}