Skip to content

Commit fde69f6

Browse files
reidmvreidmv
authoredDec 27, 2019
Merge pull request #34 from ody/full_automated_gcp_deploy
Deploy combined with GCP, macOS, Terraform
·
v3.28.00.5.0
2 parents fced412 + 491ee6a commit fde69f6

File tree

4 files changed

+35
-26
lines changed

4 files changed

+35
-26
lines changed
 

‎functions/target_host.pp ‎functions/target_name.pp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
function peadm::target_host(
1+
function peadm::target_name(
22
Variant[Target, Array[Target,0,1]] $target,
33
) >> Variant[String, Undef] {
44
case $target {
55
Target: {
6-
$target.host
6+
$target.name
77
}
88
Array[Target,1,1]: {
9-
$target[0].host
9+
$target[0].name
1010
}
1111
Array[Target,0,0]: {
1212
undef
1313
}
1414
default: {
15-
fail('Unexpected input type to peadm::target_host function')
15+
fail('Unexpected input type to peadm::target_name function')
1616
}
1717
}
1818
}

‎plans/unit/configure.pp

+10-10
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
# commented-out values should be used once GH-1244 is resolved.
4747

4848
# WORKAROUND: GH-1244
49-
$master_host_string = $master_target.peadm::target_host()
50-
$master_replica_host_string = $master_replica_target.peadm::target_host()
51-
$puppetdb_database_host_string = $puppetdb_database_target.peadm::target_host()
52-
$puppetdb_database_replica_host_string = $puppetdb_database_replica_target.peadm::target_host()
49+
$master_host_string = $master_target.peadm::target_name()
50+
$master_replica_host_string = $master_replica_target.peadm::target_name()
51+
$puppetdb_database_host_string = $puppetdb_database_target.peadm::target_name()
52+
$puppetdb_database_replica_host_string = $puppetdb_database_replica_target.peadm::target_name()
5353

5454
apply($master_target) {
5555
# Necessary to give the sandboxed Puppet executor the configuration
@@ -65,10 +65,10 @@
6565

6666
class { 'peadm::setup::node_manager':
6767
# WORKAROUND: GH-1244
68-
master_host => $master_host_string, # $master_target.peadm::target_host(),
69-
master_replica_host => $master_replica_host_string, # $master_replica_target.peadm::target_host(),
70-
puppetdb_database_host => $puppetdb_database_host_string, # $puppetdb_database_target.peadm::target_host(),
71-
puppetdb_database_replica_host => $puppetdb_database_replica_host_string, # $puppetdb_database_replica_target.peadm::target_host(),
68+
master_host => $master_host_string, # $master_target.peadm::target_name(),
69+
master_replica_host => $master_replica_host_string, # $master_replica_target.peadm::target_name(),
70+
puppetdb_database_host => $puppetdb_database_host_string, # $puppetdb_database_target.peadm::target_name(),
71+
puppetdb_database_replica_host => $puppetdb_database_replica_host_string, # $puppetdb_database_replica_target.peadm::target_name(),
7272
compiler_pool_address => $compiler_pool_address,
7373
require => File['node_manager.yaml'],
7474
}
@@ -100,13 +100,13 @@
100100
if $arch['high-availability'] {
101101
# Run the PE Replica Provision
102102
run_task('peadm::provision_replica', $master_target,
103-
master_replica => $master_replica_target.peadm::target_host(),
103+
master_replica => $master_replica_target.peadm::target_name(),
104104
token_file => $token_file,
105105
)
106106

107107
# Run the PE Replica Enable
108108
run_task('peadm::enable_replica', $master_target,
109-
master_replica => $master_replica_target.peadm::target_host(),
109+
master_replica => $master_replica_target.peadm::target_name(),
110110
token_file => $token_file,
111111
)
112112
}

‎plans/unit/install.pp

+11-11
Original file line numberDiff line numberDiff line change
@@ -117,24 +117,24 @@
117117
# Generate all the needed pe.conf files
118118
$master_pe_conf = peadm::generate_pe_conf({
119119
'console_admin_password' => $console_password,
120-
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_host(),
120+
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_name(),
121121
'pe_install::puppet_master_dnsaltnames' => $dns_alt_names,
122-
'puppet_enterprise::profile::puppetdb::database_host' => $puppetdb_database_target.peadm::target_host(),
122+
'puppet_enterprise::profile::puppetdb::database_host' => $puppetdb_database_target.peadm::target_name(),
123123
'puppet_enterprise::profile::master::code_manager_auto_configure' => true,
124124
'puppet_enterprise::profile::master::r10k_private_key' => '/etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa',
125125
'puppet_enterprise::profile::master::r10k_remote' => $r10k_remote,
126126
} + $pe_conf_data)
127127

128128
$puppetdb_database_pe_conf = peadm::generate_pe_conf({
129129
'console_admin_password' => 'not used',
130-
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_host(),
131-
'puppet_enterprise::database_host' => $puppetdb_database_target.peadm::target_host(),
130+
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_name(),
131+
'puppet_enterprise::database_host' => $puppetdb_database_target.peadm::target_name(),
132132
} + $pe_conf_data)
133133

134134
$puppetdb_database_replica_pe_conf = peadm::generate_pe_conf({
135135
'console_admin_password' => 'not used',
136-
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_host(),
137-
'puppet_enterprise::database_host' => $puppetdb_database_replica_target.peadm::target_host(),
136+
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_name(),
137+
'puppet_enterprise::database_host' => $puppetdb_database_replica_target.peadm::target_name(),
138138
} + $pe_conf_data)
139139

140140
# Upload the pe.conf files to the hosts that need them
@@ -210,7 +210,7 @@
210210
}
211211
212212
# Configure autosigning for the puppetdb database hosts 'cause they need it
213-
$autosign_conf = $database_targets.reduce('') |$memo,$target| { "${target.host}\n${memo}" }
213+
$autosign_conf = $database_targets.reduce('') |$memo,$target| { "${target.name}\n${memo}" }
214214
run_task('peadm::mkdir_p_file', $master_target,
215215
path => '/etc/puppetlabs/puppet/autosign.conf',
216216
owner => 'pe-puppet',
@@ -253,7 +253,7 @@
253253

254254
# Deploy the PE agent to all remaining hosts
255255
run_task('peadm::agent_install', $master_replica_target,
256-
server => $master_target.peadm::target_host(),
256+
server => $master_target.peadm::target_name(),
257257
install_flags => [
258258
'--puppet-service-ensure', 'stopped',
259259
"main:dns_alt_names=${dns_alt_names_csv}",
@@ -263,7 +263,7 @@
263263
)
264264

265265
run_task('peadm::agent_install', $compiler_a_targets,
266-
server => $master_target.peadm::target_host(),
266+
server => $master_target.peadm::target_name(),
267267
install_flags => [
268268
'--puppet-service-ensure', 'stopped',
269269
"main:dns_alt_names=${dns_alt_names_csv}",
@@ -273,7 +273,7 @@
273273
)
274274

275275
run_task('peadm::agent_install', $compiler_b_targets,
276-
server => $master_target.peadm::target_host(),
276+
server => $master_target.peadm::target_name(),
277277
install_flags => [
278278
'--puppet-service-ensure', 'stopped',
279279
"main:dns_alt_names=${dns_alt_names_csv}",
@@ -295,7 +295,7 @@
295295
if !empty($agent_installer_targets) {
296296
run_command(inline_epp(@(HEREDOC/L)), $master_target)
297297
/opt/puppetlabs/bin/puppetserver ca sign --certname \
298-
<%= $agent_installer_targets.map |$target| { $target.host }.join(',') -%>
298+
<%= $agent_installer_targets.map |$target| { $target.name }.join(',') -%>
299299
| HEREDOC
300300
}
301301

‎tasks/filesize.sh

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
#!/bin/bash
22

3-
size=$(stat -c%s "$PT_path" 2>/dev/null || echo null)
3+
case $(uname) in
4+
Darwin)
5+
options="-f%z"
6+
;;
7+
*)
8+
options="-c%s"
9+
;;
10+
esac
11+
12+
size=$(stat "$options" "$PT_path" 2>/dev/null || echo null)
413

514
# Output a JSON result for ease of Task usage in Puppet Task Plans
615
if [ "$size" = "null" ]; then

0 commit comments

Comments
 (0)
Please sign in to comment.