Skip to content

Stop managing environments #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 12, 2019
+184 −287
Merged

Stop managing environments #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
759ccb8
Stop managing environment node groups
reidmv Mar 12, 2019
2a45d09
Update classification image
reidmv Mar 12, 2019
4145ed9
Make B node groups optional
reidmv Mar 12, 2019
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
Binary file modified documentation/images/pe-xl-classification.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
207 changes: 82 additions & 125 deletions manifests/setup/node_manager.pp
View file
Original file line number Diff line number Diff line change
@@ -12,20 +12,34 @@
# }'
#
class pe_xl::setup::node_manager (
String[1] $master_host,
String[1] $master_replica_host,
String[1] $puppetdb_database_host,
String[1] $puppetdb_database_replica_host,
String[1] $compiler_pool_address,
Boolean $manage_environment_groups = true,
Pattern[/\A[a-z0-9_]+\Z/] $default_environment = 'production',
Array[Pattern[/\A[a-z0-9_]+\Z/]] $environments = ['production'],
String[1] $master_host,
String[1] $puppetdb_database_host,
String[1] $compiler_pool_address,

Optional[String[1]] $master_replica_host = undef,
Optional[String[1]] $puppetdb_database_replica_host = undef,
) {

if ([$master_replica_host, $puppetdb_database_replica_host].filter |$_| { $_ }.size == 1) {
fail('Must pass both master_replica_host and puppetdb_database_replica_host, or neither')
}

##################################################
# PE INFRASTRUCTURE GROUPS
##################################################

# Hiera data tuning for compilers
$compiler_data = {
'puppet_enterprise::profile::puppetdb' => {
'gc_interval' => '0',
},
'puppet_enterprise::puppetdb' => {
'command_processing_threads' => 2,
'write_maximum_pool_size' => 4,
'read_maximum_pool_size' => 10,
},
}

# We modify this group's rule such that all PE infrastructure nodes will be
# members.
node_group { 'PE Infrastructure Agent':
@@ -46,17 +60,18 @@
},
}

# We need to pre-create this group so that the master replica can be
# identified as running PuppetDB, so that Puppet will create a pg_ident
# authorization rule for it on the PostgreSQL nodes.
node_group { 'PE HA Replica':
ensure => 'present',
parent => 'PE Infrastructure',
rule => ['or', ['=', 'name', $master_replica_host]],
classes => {
'puppet_enterprise::profile::primary_master_replica' => { }
# This class has to be included here because puppet_enterprise is declared
# in the console with parameters. It is therefore not possible to include
# puppet_enterprise::profile::database in code without causing a conflict.
node_group { 'PE Database':
ensure => present,
parent => 'PE Infrastructure',
environment => 'production',
override_environment => false,
rule => ['and', ['=', ['trusted', 'extensions', 'pp_role'], 'pe_xl::puppetdb_database']],
classes => {
'puppet_enterprise::profile::database' => { },
},
variables => { 'pe_xl_replica' => true },
}

# Create data-only groups to store PuppetDB PostgreSQL database configuration
@@ -78,39 +93,8 @@
},
}

node_group { 'PE Master B':
ensure => present,
parent => 'PE Infrastructure',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_role'], 'pe_xl::master'],
['=', ['trusted', 'extensions', 'pp_cluster'], 'B'],
],
data => {
'puppet_enterprise::profile::primary_master_replica' => {
'database_host_puppetdb' => $puppetdb_database_replica_host,
},
'puppet_enterprise::profile::puppetdb' => {
'database_host' => $puppetdb_database_replica_host,
},
},
}

# Hiera data tuning for compilers
$compiler_data = {
'puppet_enterprise::profile::puppetdb' => {
'gc_interval' => '0',
},
'puppet_enterprise::puppetdb' => {
'command_processing_threads' => 2,
'write_maximum_pool_size' => 4,
'read_maximum_pool_size' => 10,
},
}

# Configure the compilers for HA, grouped into two pools, each pool
# having an affinity for one "availability zone" or the other. Even with an
# affinity, note that data from each compiler is replicated to both
# "availability zones".
# Configure the A pool for compilers. There are up to two pools for HA, each
# having an affinity for one "availability zone" or the other.
node_group { 'PE Compiler Group A':
ensure => 'present',
parent => 'PE Master',
@@ -123,91 +107,64 @@
'database_host' => $puppetdb_database_host,
},
'puppet_enterprise::profile::master' => {
'puppetdb_host' => ['${clientcert}', $master_replica_host], # lint:ignore:single_quote_string_with_variables
'puppetdb_host' => ['${clientcert}', $master_replica_host].filter |$_| { $_ }, # lint:ignore:single_quote_string_with_variables
'puppetdb_port' => [8081],
}
},
data => $compiler_data,
}

node_group { 'PE Compiler Group B':
ensure => 'present',
parent => 'PE Master',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_role'], 'pe_xl::compiler'],
['=', ['trusted', 'extensions', 'pp_cluster'], 'B'],
],
classes => {
'puppet_enterprise::profile::puppetdb' => {
'database_host' => $puppetdb_database_replica_host,
# Create the replica and B groups if a replica master and database host are
# supplied
if ($master_replica_host and $puppetdb_database_replica_host) {
# We need to pre-create this group so that the master replica can be
# identified as running PuppetDB, so that Puppet will create a pg_ident
# authorization rule for it on the PostgreSQL nodes.
node_group { 'PE HA Replica':
ensure => 'present',
parent => 'PE Infrastructure',
rule => ['or', ['=', 'name', $master_replica_host]],
classes => {
'puppet_enterprise::profile::primary_master_replica' => { }
},
'puppet_enterprise::profile::master' => {
'puppetdb_host' => ['${clientcert}', $master_host], # lint:ignore:single_quote_string_with_variables
'puppetdb_port' => [8081],
}
},
data => $compiler_data,
}

# This class has to be included here because puppet_enterprise is declared
# in the console with parameters. It is therefore not possible to include
# puppet_enterprise::profile::database in code without causing a conflict.
node_group { 'PE Database':
ensure => present,
parent => 'PE Infrastructure',
environment => 'production',
override_environment => false,
rule => ['and', ['=', ['trusted', 'extensions', 'pp_role'], 'pe_xl::puppetdb_database']],
classes => {
'puppet_enterprise::profile::database' => { },
},
}


if ($manage_environment_groups) {

##################################################
# ENVIRONMENT GROUPS
##################################################

node_group { 'All Environments':
ensure => present,
description => 'Environment group parent and default',
environment => $default_environment,
override_environment => true,
parent => 'All Nodes',
rule => ['and', ['~', 'name', '.*']],
variables => { 'pe_xl_replica' => true },
}

node_group { 'Agent-specified environment':
ensure => present,
description => 'This environment group exists for unusual testing and development only. Expect it to be empty',
environment => 'agent-specified',
override_environment => true,
parent => 'All Environments',
rule => [ ],
node_group { 'PE Master B':
ensure => present,
parent => 'PE Infrastructure',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_role'], 'pe_xl::master'],
['=', ['trusted', 'extensions', 'pp_cluster'], 'B'],
],
data => {
'puppet_enterprise::profile::primary_master_replica' => {
'database_host_puppetdb' => $puppetdb_database_replica_host,
},
'puppet_enterprise::profile::puppetdb' => {
'database_host' => $puppetdb_database_replica_host,
},
},
}

$environments.each |$env| {
$title_env = capitalize($env)

node_group { "${title_env} environment":
ensure => present,
environment => $env,
override_environment => true,
parent => 'All Environments',
rule => ['and', ['=', ['trusted', 'extensions', 'pp_environment'], $env]],
}

node_group { "${title_env} one-time run exception":
ensure => present,
description => "Allow ${env} nodes to request a different puppet environment for a one-time run",
environment => 'agent-specified',
override_environment => true,
parent => "${title_env} environment",
rule => ['and', ['~', ['fact', 'agent_specified_environment'], '.+']],
}
node_group { 'PE Compiler Group B':
ensure => 'present',
parent => 'PE Master',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_role'], 'pe_xl::compiler'],
['=', ['trusted', 'extensions', 'pp_cluster'], 'B'],
],
classes => {
'puppet_enterprise::profile::puppetdb' => {
'database_host' => $puppetdb_database_replica_host,
},
'puppet_enterprise::profile::master' => {
'puppetdb_host' => ['${clientcert}', $master_host], # lint:ignore:single_quote_string_with_variables
'puppetdb_port' => [8081],
}
},
data => $compiler_data,
}

}

}
2 changes: 0 additions & 2 deletions plans/configure.pp
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@
Boolean $executing_on_master = false,

String[1] $compiler_pool_address = $master_host,
Boolean $manage_environment_groups = true,
Optional[String[1]] $token_file = undef,
Optional[String[1]] $deploy_environment = undef,

@@ -49,7 +48,6 @@
puppetdb_database_host => $puppetdb_database_host,
puppetdb_database_replica_host => $puppetdb_database_replica_host,
compiler_pool_address => $compiler_pool_address,
manage_environment_groups => $manage_environment_groups,
)

# Run Puppet in no-op on the compilers so that their status in PuppetDB
2 changes: 0 additions & 2 deletions plans/init.pp
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
Optional[Hash] $r10k_sources = undef,
Optional[Array[String[1]]] $dns_alt_names = undef,
Optional[Boolean] $executing_on_master = undef,
Optional[Boolean] $manage_environment_groups = undef,

Optional[String[1]] $compiler_pool_address = undef,
Optional[String[1]] $deploy_environment = undef,
@@ -55,7 +54,6 @@

executing_on_master => $executing_on_master,
compiler_pool_address => $compiler_pool_address,
manage_environment_groups => $manage_environment_groups,
deploy_environment => $deploy_environment,

stagingdir => $stagingdir,
24 changes: 10 additions & 14 deletions tasks/configure_node_groups.json
View file
Original file line number Diff line number Diff line change
@@ -2,28 +2,24 @@
"description": "Configure console node groups for a new install",
"parameters": {
"master_host": {
"type": "String",
"type": "String[1]",
"description": "The certname of the master"
},
"master_replica_host": {
"type": "String",
"description": "The certname of the master replica"
},
"puppetdb_database_host": {
"type": "String",
"type": "String[1]",
"description": "The certname of the PuppetDB database"
},
"puppetdb_database_replica_host": {
"type": "String",
"description": "The certname of the PuppetDB database replica"
},
"compiler_pool_address": {
"type": "String",
"type": "String[1]",
"description": "The service name to use for the compiler pool"
},
"manage_environment_groups": {
"type": "Boolean",
"description": "This will regroup the production and additional PE Environment groups"
"master_replica_host": {
"type": "Optional[String[1]]",
"description": "The certname of the master replica"
},
"puppetdb_database_replica_host": {
"type": "Optional[String[1]]",
"description": "The certname of the PuppetDB database replica"
}
},
"input_method": "environment",
Loading