Migrate fix from HEREDOC to agent.json

Author: aramprice

stemcell_builder/lib/prelude_agent.bash

@@ -2,37 +2,5 @@
 
 base_dir=$(readlink -nf $(dirname $0)/../..)
 source $base_dir/lib/prelude_apply.bash
-source $base_dir/lib/prelude_agent.bash
 
-cat > $chroot/var/vcap/bosh/agent.json <<JSON
-{
-  "Platform": {
-    "Linux": {
-      $(get_partitioner_type_mapping)
-      "DevicePathResolutionType": "virtio",
-      "CreatePartitionIfNoEphemeralDisk": true,
-      "ServiceManager": "systemd",
-      "DiskIDTransformPattern": "^vol-(.+)$",
-      "DiskIDTransformReplacement": "nvme-Amazon_Elastic_Block_Store_vol${1}",
-      "UseMonitIptablesFirewall": true,
-      "InstanceStorageDevicePattern": "/dev/nvme*n1",
-      "InstanceStorageManagedVolumePattern": "/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_*"
-    }
-  },
-  "Infrastructure": {
-    "Settings": {
-      "Sources": [
-        {
-          "Type": "HTTP",
-          "URI": "http://169.254.169.254",
-          "UserDataPath": "/latest/user-data",
-          "InstanceIDPath": "/latest/meta-data/instance-id",
-          "SSHKeysPath": "/latest/meta-data/public-keys/0/openssh-key",
-          "TokenPath": "/latest/api/token"
-        }
-      ],
-      "UseRegistry": true
-    }
-  }
-}
-JSON
+cp $assets_dir/agent.json $chroot/var/vcap/bosh/agent.json

stemcell_builder/stages/bosh_aws_agent_settings/apply.sh

@@ -6,7 +6,10 @@
       "CreatePartitionIfNoEphemeralDisk": true,
       "ServiceManager": "systemd",
       "DiskIDTransformPattern": "^vol-(.+)$",
-      "DiskIDTransformReplacement": "nvme-Amazon_Elastic_Block_Store_vol${1}"
+      "DiskIDTransformReplacement": "nvme-Amazon_Elastic_Block_Store_vol${1}",
+      "UseMonitIptablesFirewall": true,
+      "InstanceStorageDevicePattern": "/dev/nvme*n1",
+      "InstanceStorageManagedVolumePattern": "/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_*"
     }
   },
   "Infrastructure": {
@@ -24,4 +27,4 @@
       "UseRegistry": true
     }
   }
-}
+}