Skip to content

Commit e05c988

Browse files
committed
Remove external module deps
1 parent 9d97888 commit e05c988

File tree

5 files changed

+16
-26
lines changed

5 files changed

+16
-26
lines changed

.fixtures.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
22
fixtures:
33
repositories:
4-
stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib"
5-
postgresql: "git://github.com/puppetlabs/puppetlabs-postgresql"
64
cron_core: "git://github.com/puppetlabs/puppetlabs-cron_core"

.rubocop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Style/BlockDelimiters:
4343
Style/BracesAroundHashParameters:
4444
Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
4545
See https://github.com/rubocop-hq/rubocop/pull/7643
46-
Enabled: true
46+
Enabled: false
4747
Style/ClassAndModuleChildren:
4848
Description: Compact style reduces the required amount of indentation.
4949
EnforcedStyle: compact

manifests/postgresql_settings.pp

+12-12
Original file line numberDiff line numberDiff line change
@@ -61,43 +61,43 @@
6161
notify => $notify_postgresql_service,
6262
}
6363

64-
postgresql_conf { 'autovacuum_vacuum_scale_factor' :
64+
pe_postgresql_conf { 'autovacuum_vacuum_scale_factor' :
6565
value => sprintf('%#.2f', $autovacuum_vacuum_scale_factor),
6666
}
6767

68-
postgresql_conf { 'autovacuum_analyze_scale_factor' :
68+
pe_postgresql_conf { 'autovacuum_analyze_scale_factor' :
6969
value => sprintf('%#.2f', $autovacuum_analyze_scale_factor),
7070
}
7171

72-
postgresql_conf { 'autovacuum_max_workers' :
72+
pe_postgresql_conf { 'autovacuum_max_workers' :
7373
value => String($autovacuum_max_workers),
7474
}
7575

76-
postgresql_conf { 'autovacuum_work_mem' :
76+
pe_postgresql_conf { 'autovacuum_work_mem' :
7777
value => String($autovacuum_work_mem),
7878
}
7979

80-
postgresql_conf { 'log_autovacuum_min_duration' :
80+
pe_postgresql_conf { 'log_autovacuum_min_duration' :
8181
value => String($log_autovacuum_min_duration),
8282
}
8383

84-
postgresql_conf { 'log_temp_files' :
84+
pe_postgresql_conf { 'log_temp_files' :
8585
value => String($log_temp_files),
8686
}
8787

88-
postgresql_conf { 'maintenance_work_mem' :
88+
pe_postgresql_conf { 'maintenance_work_mem' :
8989
value => String($maintenance_work_mem),
9090
}
9191

92-
postgresql_conf { 'work_mem' :
92+
pe_postgresql_conf { 'work_mem' :
9393
value => String($work_mem),
9494
}
9595

96-
postgresql_conf { 'max_connections' :
96+
pe_postgresql_conf { 'max_connections' :
9797
value => String($max_connections),
9898
}
9999

100-
postgresql_conf { 'checkpoint_completion_target' :
100+
pe_postgresql_conf { 'checkpoint_completion_target' :
101101
value => sprintf('%#.2f', $checkpoint_completion_target),
102102
}
103103

@@ -106,14 +106,14 @@
106106
default => 'absent',
107107
}
108108

109-
postgresql_conf { 'checkpoint_segments' :
109+
pe_postgresql_conf { 'checkpoint_segments' :
110110
ensure => $checkpoint_segments_ensure,
111111
value => String($checkpoint_segments),
112112
}
113113

114114
if !empty($arbitrary_postgresql_conf_settings) {
115115
$arbitrary_postgresql_conf_settings.each | $key, $value | {
116-
postgresql_conf { $key :
116+
pe_postgresql_conf { $key :
117117
value => String($value),
118118
}
119119
}

manifests/set_table_attribute.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
) {
1111

1212
# lint:ignore:140chars
13-
postgresql_psql { "Set ${table_attribute}=${table_attribute_value} for ${table_name}" :
13+
pe_postgresql_psql { "Set ${table_attribute}=${table_attribute_value} for ${table_name}" :
1414
command => "ALTER TABLE ${table_name} SET ( ${table_attribute} = ${table_attribute_value} )",
1515
unless => "SELECT reloptions FROM pg_class WHERE relname = '${table_name}' AND CAST(reloptions as text) LIKE '%${table_attribute}=${table_attribute_value}%'",
1616
db => $db,

metadata.json

+2-10
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88
"project_page": "https://github.com/puppetlabs/puppetlabs-pe_databases",
99
"issues_url": "https://github.com/puppetlabs/puppetlabs-pe_databases/issues",
1010
"dependencies": [
11-
{
12-
"name": "puppetlabs-postgresql",
13-
"version_requirement": ">= 4.7.0 < 7.0.0"
14-
},
15-
{
16-
"name": "puppetlabs-stdlib",
17-
"version_requirement": ">= 4.0.0 < 7.0.0"
18-
}
1911
],
2012
"operatingsystem_support": [
2113
{
@@ -73,7 +65,7 @@
7365
"version_requirement": ">= 5.5.0"
7466
}
7567
],
76-
"pdk-version": "1.18.1",
68+
"pdk-version": "2.1.0",
7769
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
78-
"template-ref": "heads/master-0-gd610ead"
70+
"template-ref": "remotes/origin/master-0-ga58fd92"
7971
}

0 commit comments

Comments
 (0)