Skip to content

Commit 153e0c5

Browse files
committed
fix: replace files dropped in merge forward
1 parent 220d86b commit 153e0c5

2 files changed

Lines changed: 37 additions & 1 deletion

File tree

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
function get_partitioner_type_mapping {
3+
echo '"PartitionerType": "parted",'
4+
}

stemcell_builder/stages/bosh_aws_agent_settings/apply.sh

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,37 @@
22

33
base_dir=$(readlink -nf $(dirname $0)/../..)
44
source $base_dir/lib/prelude_apply.bash
5+
source $base_dir/lib/prelude_agent.bash
56

6-
cp $assets_dir/agent.json $chroot/var/vcap/bosh/agent.json
7+
cat > $chroot/var/vcap/bosh/agent.json <<JSON
8+
{
9+
"Platform": {
10+
"Linux": {
11+
$(get_partitioner_type_mapping)
12+
"DevicePathResolutionType": "virtio",
13+
"CreatePartitionIfNoEphemeralDisk": true,
14+
"ServiceManager": "systemd",
15+
"DiskIDTransformPattern": "^vol-(.+)$",
16+
"DiskIDTransformReplacement": "nvme-Amazon_Elastic_Block_Store_vol${1}",
17+
"UseMonitIptablesFirewall": true,
18+
"InstanceStorageDevicePattern": "/dev/nvme*n1",
19+
"InstanceStorageManagedVolumePattern": "/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_*"
20+
}
21+
},
22+
"Infrastructure": {
23+
"Settings": {
24+
"Sources": [
25+
{
26+
"Type": "HTTP",
27+
"URI": "http://169.254.169.254",
28+
"UserDataPath": "/latest/user-data",
29+
"InstanceIDPath": "/latest/meta-data/instance-id",
30+
"SSHKeysPath": "/latest/meta-data/public-keys/0/openssh-key",
31+
"TokenPath": "/latest/api/token"
32+
}
33+
],
34+
"UseRegistry": true
35+
}
36+
}
37+
}
38+
JSON

0 commit comments

Comments
 (0)