RS-201 Makes EBS volume type configurable

matthew-d · matthew-d · commit 5caf4b3f34ce · 2025-08-21T11:06:45.000+10:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Changed
+- Makes EBS data volume type configurable #RS-201
+
 ## [6.9.0] - 2023-07-26
 ### Changed
 - Upgrade puppet-aem-curator to 3.41.0 #RS-166
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,225 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.3)
+    base64 (0.3.0)
+    builder (3.3.0)
+    coderay (1.1.3)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.9)
+    cri (2.15.12)
+    deep_merge (1.2.2)
+    diff-lcs (1.6.2)
+    docker-api (1.34.2)
+      excon (>= 0.47.0)
+      multi_json
+    erubi (1.13.1)
+    excon (1.2.5)
+      logger
+    facter (2.5.7)
+    faraday (2.8.1)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-net_http (3.0.2)
+    fast_gettext (1.1.2)
+    ffi (1.17.2)
+    gettext (3.2.9)
+      locale (>= 2.0.5)
+      text (>= 1.3.0)
+    gettext-setup (0.34)
+      fast_gettext (~> 1.1.0)
+      gettext (>= 3.0.2, < 3.3.0)
+      locale
+    gssapi (1.3.1)
+      ffi (>= 1.0.1)
+    gyoku (1.4.0)
+      builder (>= 2.1.2)
+      rexml (~> 3.0)
+    hashie (3.6.0)
+    hiera (3.12.0)
+    hocon (1.4.0)
+    htmlentities (4.3.4)
+    httpclient (2.9.0)
+      mutex_m
+    inspec (1.51.6)
+      addressable (~> 2.4)
+      faraday (>= 0.9.0)
+      hashie (~> 3.4)
+      htmlentities
+      json (>= 1.8, < 3.0)
+      method_source (~> 0.8)
+      mixlib-log
+      parallel (~> 1.9)
+      parslet (~> 1.5)
+      pry (~> 0)
+      rspec (~> 3)
+      rspec-its (~> 1.2)
+      rubyzip (~> 1.1)
+      semverse
+      sslshake (~> 1.2)
+      thor (~> 0.19)
+      tomlrb (~> 1.2)
+      train (~> 0.32)
+    json (2.13.2)
+    jwt (2.2.3)
+    little-plugger (1.1.4)
+    locale (2.1.4)
+    log4r (1.1.10)
+    logger (1.7.0)
+    logging (2.4.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.14)
+    method_source (0.9.2)
+    minitar (0.12.1)
+    mixlib-log (3.0.9)
+    mixlib-shellout (2.4.4)
+    mocha (1.16.1)
+    multi_json (1.15.0)
+    mutex_m (0.3.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (4.2.0)
+    nori (2.6.0)
+    parallel (1.27.0)
+    parser (3.3.9.0)
+      ast (~> 2.4.1)
+      racc
+    parslet (1.8.2)
+    pathspec (1.0.0)
+    prism (1.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (5.1.1)
+    puppet (7.34.0)
+      concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
+      facter (> 2.0.1, < 5)
+      fast_gettext (>= 1.1, < 3)
+      hiera (>= 3.2.1, < 4)
+      locale (~> 2.1)
+      multi_json (~> 1.10)
+      puppet-resource_api (~> 1.5)
+      scanf (~> 1.0)
+      semantic_puppet (~> 1.0)
+    puppet-lint (2.5.2)
+    puppet-resource_api (1.9.0)
+      hocon (>= 1.0)
+    puppet-syntax (3.3.0)
+      puppet (>= 5)
+      rake
+    puppet_forge (5.0.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects (~> 0.3.0)
+      minitar (< 1.0.0)
+      semantic_puppet (~> 1.0)
+    puppetlabs_spec_helper (4.0.1)
+      mocha (~> 1.0)
+      pathspec (>= 0.2.1, < 1.1.0)
+      puppet-lint (~> 2.0)
+      puppet-syntax (>= 2.0, < 4)
+      rspec-puppet (~> 2.0)
+    r10k (3.15.1)
+      colored2 (= 3.1.2)
+      cri (>= 2.15.10)
+      fast_gettext (>= 1.1.0, < 3.0.0)
+      gettext (>= 3.0.2, < 4.0.0)
+      gettext-setup (~> 0.24)
+      jwt (~> 2.2.3)
+      log4r (= 1.1.10)
+      minitar (~> 0.9)
+      multi_json (~> 1.10)
+      puppet_forge (>= 2.3.0)
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.3.0)
+    regexp_parser (2.11.2)
+    rexml (3.4.1)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-its (1.3.1)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-puppet (2.12.0)
+      rspec
+    rspec-support (3.13.4)
+    rubocop (1.35.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.1.2.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    rubyntlm (0.6.5)
+      base64
+    rubyzip (1.3.0)
+    scanf (1.0.0)
+    semantic_puppet (1.1.1)
+    semverse (3.0.2)
+    sslshake (1.3.1)
+    text (1.3.1)
+    thor (0.20.3)
+    tomlrb (1.3.0)
+    train (0.32.0)
+      docker-api (~> 1.26)
+      json (>= 1.8, < 3.0)
+      mixlib-shellout (~> 2.0)
+      net-scp (~> 1.2)
+      net-ssh (>= 2.9, < 5.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    unicode-display_width (2.6.0)
+    winrm (2.3.6)
+      builder (>= 2.1.2)
+      erubi (~> 1.8)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    winrm-fs (1.3.3)
+      erubi (~> 1.8)
+      logging (>= 1.6.1, < 3.0)
+      rubyzip (~> 1.1)
+      winrm (~> 2.0)
+    yaml-lint (0.0.10)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  concurrent-ruby (= 1.1.9)
+  inspec (= 1.51.6)
+  puppet (~> 7.18)
+  puppet-lint (= 2.5.2)
+  puppetlabs_spec_helper (= 4.0.1)
+  r10k (= 3.15.1)
+  rubocop (= 1.35.1)
+  yaml-lint (= 0.0.10)
+
+BUNDLED WITH
+   2.3.21
diff --git a/data/author-publish-dispatcher.yaml b/data/author-publish-dispatcher.yaml
@@ -21,7 +21,7 @@ author_publish_dispatcher::dispatcher_data_devices:
   - device_name: "%{hiera('common::ami::publish_dispatcher_device_name')}"
     device_alias: "%{hiera('common::ami::publish_dispatcher_device_alias')}"
 
-author_publish_dispatcher::volume_type: gp2
+author_publish_dispatcher::volume_type: "%{hiera('common::volume_type')"
 
 author_publish_dispatcher::aem_password_retrieval_command: "%{hiera('common::aem_password_retrieval_command')}"
 author_publish_dispatcher::awslogs_config_path: "%{hiera('common::awslogs_config_path')}"
diff --git a/data/publish.yaml b/data/publish.yaml
@@ -8,7 +8,7 @@ publish::aem_repo_devices:
   - device_name: "%{hiera('common::ami::device_name')}"
     device_alias: "%{hiera('common::ami::device_alias')}"
     aem_id: "%{hiera('publish::aem_id')}"
-publish::volume_type: gp2
+publish::volume_type: "%{hiera('common::volume_type')"
 
 publish::revert_snapshot_type: "%{hiera('publish::revert_snapshot_type')}"
 
