From a4aa3438a31c145de0ab03f4955637445274d9ab Mon Sep 17 00:00:00 2001 From: test Date: Tue, 23 Nov 2021 10:18:15 +1100 Subject: [PATCH 1/2] update ami ids --- Makefile | 2 +- ...2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml | 14 +++++++------- ...-amazon-linux2-jdk11-stack-builder-ami-ids.yaml | 14 +++++++------- ...8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml | 14 +++++++------- ...aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml | 4 ++-- ...em65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml | 14 +++++++------- ...2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml | 14 +++++++------- ...-amazon-linux2-jdk11-stack-builder-ami-ids.yaml | 14 +++++++------- ...8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml | 14 +++++++------- ...aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml | 4 ++-- ...em65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml | 14 +++++++------- ...2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml | 14 +++++++------- ...aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml | 4 ++-- ...-amazon-linux2-jdk11-stack-builder-ami-ids.yaml | 14 +++++++------- ...8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml | 14 +++++++------- ...em65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml | 14 +++++++------- 16 files changed, 91 insertions(+), 91 deletions(-) diff --git a/Makefile b/Makefile index 3100ec5e..767b5ef1 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ gen-aem-aws-stack-builder-ami-ids: stage make gen-aem-aws-stack-builder define gen_aem_aws_stack_builder_ami_ids - cd stage/packer-aem/ && version="ci-main-aws-*" make clean ami-ids config_path=../../packer-aem/$(1)-$(2)-$(3)-$(4)/ + cd stage/packer-aem/ && version="*" make clean ami-ids config_path=../../packer-aem/$(1)-$(2)-$(3)-$(4)/ cp stage/packer-aem/stage/stack-builder-configs/*.yaml aem-aws-stack-builder/src/apps/aem/ endef diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml index 2bd1303b..ac02451c 100644 --- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem64_sp2 on OS type amazon-linux2 with Java version jdk8 ami_ids: - author: ami-02d50496ca962eac0 - author_dispatcher: ami-036c7eec31fa07ef8 - author_publish_dispatcher: ami-0ee7471815ec0af0d - chaos_monkey: ami-096a12741130cec72 - orchestrator: ami-096a12741130cec72 - publish: ami-05545d12d675bc6a9 - publish_dispatcher: ami-036c7eec31fa07ef8 + author: ami-014b5a3de5cb49604 + author_dispatcher: ami-00e7876e5c4d1794b + author_publish_dispatcher: ami-05a7d8a01614512ee + chaos_monkey: ami-0340e55d941c3c073 + orchestrator: ami-0340e55d941c3c073 + publish: ami-0ecdbc1cc46ffbe9f + publish_dispatcher: ami-00e7876e5c4d1794b diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml index 180128d2..34970e8a 100644 --- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem65_sp8 on OS type amazon-linux2 with Java version jdk11 ami_ids: - author: null - author_dispatcher: null - author_publish_dispatcher: null - chaos_monkey: null - orchestrator: null - publish: null - publish_dispatcher: null + author: ami-0f82b4d0283dc4521 + author_dispatcher: ami-09c48bd8ffeedc06a + author_publish_dispatcher: ami-01d3e8f951247cf3f + chaos_monkey: ami-0d9f5d5fa92312e8e + orchestrator: ami-0d9f5d5fa92312e8e + publish: ami-0818c32e01e74cef7 + publish_dispatcher: ami-09c48bd8ffeedc06a diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml index 78e84cf4..8206d14c 100644 --- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem65_sp8 on OS type amazon-linux2 with Java version jdk8 ami_ids: - author: null - author_dispatcher: null - author_publish_dispatcher: ami-04ff96e3122a700fb - chaos_monkey: null - orchestrator: null - publish: null - publish_dispatcher: null + author: ami-079b6a813f1e20816 + author_dispatcher: ami-00644abd7a12cb6b6 + author_publish_dispatcher: ami-0acd9dede13d2fa80 + chaos_monkey: ami-0d9f5d5fa92312e8e + orchestrator: ami-0d9f5d5fa92312e8e + publish: ami-09e4b323eda233f5a + publish_dispatcher: ami-00644abd7a12cb6b6 diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml index c41f62e6..8f14439e 100644 --- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml @@ -5,7 +5,7 @@ ami_ids: author: null author_dispatcher: null author_publish_dispatcher: null - chaos_monkey: null - orchestrator: null + chaos_monkey: ami-0aef66210d23f3db9 + orchestrator: ami-0aef66210d23f3db9 publish: null publish_dispatcher: null diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml index c8506395..63a2d673 100644 --- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem65_sp8 on OS type rhel7 with Java version jdk11 ami_ids: - author: null - author_dispatcher: null - author_publish_dispatcher: null - chaos_monkey: null - orchestrator: null - publish: null - publish_dispatcher: null + author: ami-06104320e20a53597 + author_dispatcher: ami-0a1b09aa000b21995 + author_publish_dispatcher: ami-06230868e33cf8be2 + chaos_monkey: ami-02802fda970c45740 + orchestrator: ami-02802fda970c45740 + publish: ami-07327ce4430d7ee20 + publish_dispatcher: ami-0a1b09aa000b21995 diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml index 2bd1303b..ac02451c 100644 --- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem64_sp2 on OS type amazon-linux2 with Java version jdk8 ami_ids: - author: ami-02d50496ca962eac0 - author_dispatcher: ami-036c7eec31fa07ef8 - author_publish_dispatcher: ami-0ee7471815ec0af0d - chaos_monkey: ami-096a12741130cec72 - orchestrator: ami-096a12741130cec72 - publish: ami-05545d12d675bc6a9 - publish_dispatcher: ami-036c7eec31fa07ef8 + author: ami-014b5a3de5cb49604 + author_dispatcher: ami-00e7876e5c4d1794b + author_publish_dispatcher: ami-05a7d8a01614512ee + chaos_monkey: ami-0340e55d941c3c073 + orchestrator: ami-0340e55d941c3c073 + publish: ami-0ecdbc1cc46ffbe9f + publish_dispatcher: ami-00e7876e5c4d1794b diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml index 180128d2..34970e8a 100644 --- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem65_sp8 on OS type amazon-linux2 with Java version jdk11 ami_ids: - author: null - author_dispatcher: null - author_publish_dispatcher: null - chaos_monkey: null - orchestrator: null - publish: null - publish_dispatcher: null + author: ami-0f82b4d0283dc4521 + author_dispatcher: ami-09c48bd8ffeedc06a + author_publish_dispatcher: ami-01d3e8f951247cf3f + chaos_monkey: ami-0d9f5d5fa92312e8e + orchestrator: ami-0d9f5d5fa92312e8e + publish: ami-0818c32e01e74cef7 + publish_dispatcher: ami-09c48bd8ffeedc06a diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml index 78e84cf4..8206d14c 100644 --- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem65_sp8 on OS type amazon-linux2 with Java version jdk8 ami_ids: - author: null - author_dispatcher: null - author_publish_dispatcher: ami-04ff96e3122a700fb - chaos_monkey: null - orchestrator: null - publish: null - publish_dispatcher: null + author: ami-079b6a813f1e20816 + author_dispatcher: ami-00644abd7a12cb6b6 + author_publish_dispatcher: ami-0acd9dede13d2fa80 + chaos_monkey: ami-0d9f5d5fa92312e8e + orchestrator: ami-0d9f5d5fa92312e8e + publish: ami-09e4b323eda233f5a + publish_dispatcher: ami-00644abd7a12cb6b6 diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml index c41f62e6..8f14439e 100644 --- a/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml @@ -5,7 +5,7 @@ ami_ids: author: null author_dispatcher: null author_publish_dispatcher: null - chaos_monkey: null - orchestrator: null + chaos_monkey: ami-0aef66210d23f3db9 + orchestrator: ami-0aef66210d23f3db9 publish: null publish_dispatcher: null diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml index c8506395..63a2d673 100644 --- a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem65_sp8 on OS type rhel7 with Java version jdk11 ami_ids: - author: null - author_dispatcher: null - author_publish_dispatcher: null - chaos_monkey: null - orchestrator: null - publish: null - publish_dispatcher: null + author: ami-06104320e20a53597 + author_dispatcher: ami-0a1b09aa000b21995 + author_publish_dispatcher: ami-06230868e33cf8be2 + chaos_monkey: ami-02802fda970c45740 + orchestrator: ami-02802fda970c45740 + publish: ami-07327ce4430d7ee20 + publish_dispatcher: ami-0a1b09aa000b21995 diff --git a/aem-aws-stack-builder/src/apps/aem/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/src/apps/aem/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml index 2bd1303b..ac02451c 100644 --- a/aem-aws-stack-builder/src/apps/aem/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/src/apps/aem/aem64_sp2-amazon-linux2-jdk8-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem64_sp2 on OS type amazon-linux2 with Java version jdk8 ami_ids: - author: ami-02d50496ca962eac0 - author_dispatcher: ami-036c7eec31fa07ef8 - author_publish_dispatcher: ami-0ee7471815ec0af0d - chaos_monkey: ami-096a12741130cec72 - orchestrator: ami-096a12741130cec72 - publish: ami-05545d12d675bc6a9 - publish_dispatcher: ami-036c7eec31fa07ef8 + author: ami-014b5a3de5cb49604 + author_dispatcher: ami-00e7876e5c4d1794b + author_publish_dispatcher: ami-05a7d8a01614512ee + chaos_monkey: ami-0340e55d941c3c073 + orchestrator: ami-0340e55d941c3c073 + publish: ami-0ecdbc1cc46ffbe9f + publish_dispatcher: ami-00e7876e5c4d1794b diff --git a/aem-aws-stack-builder/src/apps/aem/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/src/apps/aem/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml index c41f62e6..8f14439e 100644 --- a/aem-aws-stack-builder/src/apps/aem/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/src/apps/aem/aem64_sp2-rhel7-jdk8-stack-builder-ami-ids.yaml @@ -5,7 +5,7 @@ ami_ids: author: null author_dispatcher: null author_publish_dispatcher: null - chaos_monkey: null - orchestrator: null + chaos_monkey: ami-0aef66210d23f3db9 + orchestrator: ami-0aef66210d23f3db9 publish: null publish_dispatcher: null diff --git a/aem-aws-stack-builder/src/apps/aem/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/src/apps/aem/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml index 180128d2..34970e8a 100644 --- a/aem-aws-stack-builder/src/apps/aem/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/src/apps/aem/aem65_sp8-amazon-linux2-jdk11-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem65_sp8 on OS type amazon-linux2 with Java version jdk11 ami_ids: - author: null - author_dispatcher: null - author_publish_dispatcher: null - chaos_monkey: null - orchestrator: null - publish: null - publish_dispatcher: null + author: ami-0f82b4d0283dc4521 + author_dispatcher: ami-09c48bd8ffeedc06a + author_publish_dispatcher: ami-01d3e8f951247cf3f + chaos_monkey: ami-0d9f5d5fa92312e8e + orchestrator: ami-0d9f5d5fa92312e8e + publish: ami-0818c32e01e74cef7 + publish_dispatcher: ami-09c48bd8ffeedc06a diff --git a/aem-aws-stack-builder/src/apps/aem/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/src/apps/aem/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml index 78e84cf4..8206d14c 100644 --- a/aem-aws-stack-builder/src/apps/aem/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/src/apps/aem/aem65_sp8-amazon-linux2-jdk8-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem65_sp8 on OS type amazon-linux2 with Java version jdk8 ami_ids: - author: null - author_dispatcher: null - author_publish_dispatcher: ami-04ff96e3122a700fb - chaos_monkey: null - orchestrator: null - publish: null - publish_dispatcher: null + author: ami-079b6a813f1e20816 + author_dispatcher: ami-00644abd7a12cb6b6 + author_publish_dispatcher: ami-0acd9dede13d2fa80 + chaos_monkey: ami-0d9f5d5fa92312e8e + orchestrator: ami-0d9f5d5fa92312e8e + publish: ami-09e4b323eda233f5a + publish_dispatcher: ami-00644abd7a12cb6b6 diff --git a/aem-aws-stack-builder/src/apps/aem/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/src/apps/aem/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml index c8506395..63a2d673 100644 --- a/aem-aws-stack-builder/src/apps/aem/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml +++ b/aem-aws-stack-builder/src/apps/aem/aem65_sp8-rhel7-jdk11-stack-builder-ami-ids.yaml @@ -2,10 +2,10 @@ # Generated by Packer AEM # AMI IDs for AEM profile aem65_sp8 on OS type rhel7 with Java version jdk11 ami_ids: - author: null - author_dispatcher: null - author_publish_dispatcher: null - chaos_monkey: null - orchestrator: null - publish: null - publish_dispatcher: null + author: ami-06104320e20a53597 + author_dispatcher: ami-0a1b09aa000b21995 + author_publish_dispatcher: ami-06230868e33cf8be2 + chaos_monkey: ami-02802fda970c45740 + orchestrator: ami-02802fda970c45740 + publish: ami-07327ce4430d7ee20 + publish_dispatcher: ami-0a1b09aa000b21995 From 13c705d8e8c9aacfd2de7dea4d40752434b5dac7 Mon Sep 17 00:00:00 2001 From: test Date: Tue, 30 Nov 2021 17:41:47 +1100 Subject: [PATCH 2/2] update instance type --- .../consolidated-lightweight.yaml | 2 +- .../os-amazon-linux2.yaml | 6 +++--- .../consolidated-lightweight.yaml | 2 +- .../os-amazon-linux2.yaml | 6 +++--- .../consolidated-lightweight.yaml | 2 +- .../os-amazon-linux2.yaml | 6 +++--- .../consolidated-lightweight.yaml | 2 +- .../aem-consolidated-rhel7-aem64-saml/consolidated.yaml | 2 +- .../consolidated-heavyweight.yaml | 2 +- .../consolidated-heavyweight.yaml | 2 +- .../full-set-lightweight.yaml | 4 ++-- .../os-amazon-linux2.yaml | 6 +++--- .../full-set-lightweight.yaml | 4 ++-- .../os-amazon-linux2.yaml | 6 +++--- .../full-set-lightweight.yaml | 4 ++-- .../os-amazon-linux2.yaml | 6 +++--- .../aem-full-set-rhel7-aem64-jdk8/full-set-lightweight.yaml | 4 ++-- .../full-set-heavyweight.yaml | 4 ++-- .../aem-full-set-rhel7-aem65-jdk8/full-set-heavyweight.yaml | 4 ++-- .../aem-reconfiguration-aem64/consolidated.yaml | 2 +- .../aem-testing-blue-green-aem64/full-set.yaml | 4 ++-- .../aem-testing-recovery-aem64/full-set.yaml | 4 ++-- .../aem-upgrade-export-aem64/consolidated.yaml | 2 +- .../aem-upgrade-import-aem64/consolidated.yaml | 2 +- .../aem-upgrade-import-aem65/consolidated.yaml | 2 +- .../aem-upgrade-in-place-aem62-aem64/consolidated.yaml | 2 +- .../aem-upgrade-in-place-aem63-aem64/consolidated.yaml | 2 +- .../aem-upgrade-in-place-aem64-aem65/consolidated.yaml | 2 +- .../src/apps/aem/consolidated-heavyweight.yaml | 2 +- .../src/apps/aem/consolidated-lightweight.yaml | 2 +- .../src/apps/aem/full-set-heavyweight.yaml | 4 ++-- .../src/apps/aem/full-set-lightweight.yaml | 4 ++-- aem-aws-stack-builder/src/apps/aem/os-amazon-linux2.yaml | 6 +++--- 33 files changed, 57 insertions(+), 57 deletions(-) diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/consolidated-lightweight.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/consolidated-lightweight.yaml index c92d8a04..66d3ff0d 100644 --- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/consolidated-lightweight.yaml +++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/consolidated-lightweight.yaml @@ -1,5 +1,5 @@ --- author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 150 diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/os-amazon-linux2.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/os-amazon-linux2.yaml index 63a2fe6c..d14510df 100644 --- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/os-amazon-linux2.yaml +++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem64-jdk8/os-amazon-linux2.yaml @@ -5,16 +5,16 @@ publish_dispatcher: instance_type: t3.micro publish: - instance_type: m4.large + instance_type: m5.large author: - instance_type: m4.large + instance_type: m5.large author_dispatcher: instance_type: t3.micro author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge orchestrator: instance_type: t3.small diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/consolidated-lightweight.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/consolidated-lightweight.yaml index c92d8a04..66d3ff0d 100644 --- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/consolidated-lightweight.yaml +++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/consolidated-lightweight.yaml @@ -1,5 +1,5 @@ --- author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 150 diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/os-amazon-linux2.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/os-amazon-linux2.yaml index 63a2fe6c..d14510df 100644 --- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/os-amazon-linux2.yaml +++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk11/os-amazon-linux2.yaml @@ -5,16 +5,16 @@ publish_dispatcher: instance_type: t3.micro publish: - instance_type: m4.large + instance_type: m5.large author: - instance_type: m4.large + instance_type: m5.large author_dispatcher: instance_type: t3.micro author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge orchestrator: instance_type: t3.small diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/consolidated-lightweight.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/consolidated-lightweight.yaml index c92d8a04..66d3ff0d 100644 --- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/consolidated-lightweight.yaml +++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/consolidated-lightweight.yaml @@ -1,5 +1,5 @@ --- author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 150 diff --git a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/os-amazon-linux2.yaml b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/os-amazon-linux2.yaml index 63a2fe6c..d14510df 100644 --- a/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/os-amazon-linux2.yaml +++ b/aem-aws-stack-builder/aem-consolidated-amazon-linux2-aem65-jdk8/os-amazon-linux2.yaml @@ -5,16 +5,16 @@ publish_dispatcher: instance_type: t3.micro publish: - instance_type: m4.large + instance_type: m5.large author: - instance_type: m4.large + instance_type: m5.large author_dispatcher: instance_type: t3.micro author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge orchestrator: instance_type: t3.small diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/consolidated-lightweight.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/consolidated-lightweight.yaml index c92d8a04..66d3ff0d 100644 --- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/consolidated-lightweight.yaml +++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-jdk8/consolidated-lightweight.yaml @@ -1,5 +1,5 @@ --- author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 150 diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-saml/consolidated.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-saml/consolidated.yaml index 9816cb34..11fe903e 100644 --- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-saml/consolidated.yaml +++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem64-saml/consolidated.yaml @@ -135,7 +135,7 @@ saml: file: s3://aem-opencloud/adobeaemcloud/certs/google_saml_cert.pem author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 100 tag_name: AEM Author Publish Dispatcher diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/consolidated-heavyweight.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/consolidated-heavyweight.yaml index b84cbc82..ac214b51 100644 --- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/consolidated-heavyweight.yaml +++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11/consolidated-heavyweight.yaml @@ -1,5 +1,5 @@ --- author_publish_dispatcher: - instance_type: m4.2xlarge + instance_type: m5.2xlarge root_vol_size: 50 data_vol_size: 200 diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/consolidated-heavyweight.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/consolidated-heavyweight.yaml index b84cbc82..ac214b51 100644 --- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/consolidated-heavyweight.yaml +++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/consolidated-heavyweight.yaml @@ -1,5 +1,5 @@ --- author_publish_dispatcher: - instance_type: m4.2xlarge + instance_type: m5.2xlarge root_vol_size: 50 data_vol_size: 200 diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/full-set-lightweight.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/full-set-lightweight.yaml index 2b2ef99a..deba120e 100644 --- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/full-set-lightweight.yaml +++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/full-set-lightweight.yaml @@ -11,12 +11,12 @@ publish: asg_min_size: 2 asg_desired_capacity: 2 asg_max_size: 3 - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 75 author: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 75 diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/os-amazon-linux2.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/os-amazon-linux2.yaml index 63a2fe6c..d14510df 100644 --- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/os-amazon-linux2.yaml +++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem64-jdk8/os-amazon-linux2.yaml @@ -5,16 +5,16 @@ publish_dispatcher: instance_type: t3.micro publish: - instance_type: m4.large + instance_type: m5.large author: - instance_type: m4.large + instance_type: m5.large author_dispatcher: instance_type: t3.micro author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge orchestrator: instance_type: t3.small diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/full-set-lightweight.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/full-set-lightweight.yaml index 2b2ef99a..deba120e 100644 --- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/full-set-lightweight.yaml +++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/full-set-lightweight.yaml @@ -11,12 +11,12 @@ publish: asg_min_size: 2 asg_desired_capacity: 2 asg_max_size: 3 - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 75 author: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 75 diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/os-amazon-linux2.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/os-amazon-linux2.yaml index 63a2fe6c..d14510df 100644 --- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/os-amazon-linux2.yaml +++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk11/os-amazon-linux2.yaml @@ -5,16 +5,16 @@ publish_dispatcher: instance_type: t3.micro publish: - instance_type: m4.large + instance_type: m5.large author: - instance_type: m4.large + instance_type: m5.large author_dispatcher: instance_type: t3.micro author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge orchestrator: instance_type: t3.small diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/full-set-lightweight.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/full-set-lightweight.yaml index 2b2ef99a..deba120e 100644 --- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/full-set-lightweight.yaml +++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/full-set-lightweight.yaml @@ -11,12 +11,12 @@ publish: asg_min_size: 2 asg_desired_capacity: 2 asg_max_size: 3 - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 75 author: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 75 diff --git a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/os-amazon-linux2.yaml b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/os-amazon-linux2.yaml index 63a2fe6c..d14510df 100644 --- a/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/os-amazon-linux2.yaml +++ b/aem-aws-stack-builder/aem-full-set-amazon-linux2-aem65-jdk8/os-amazon-linux2.yaml @@ -5,16 +5,16 @@ publish_dispatcher: instance_type: t3.micro publish: - instance_type: m4.large + instance_type: m5.large author: - instance_type: m4.large + instance_type: m5.large author_dispatcher: instance_type: t3.micro author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge orchestrator: instance_type: t3.small diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/full-set-lightweight.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/full-set-lightweight.yaml index 2b2ef99a..deba120e 100644 --- a/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/full-set-lightweight.yaml +++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem64-jdk8/full-set-lightweight.yaml @@ -11,12 +11,12 @@ publish: asg_min_size: 2 asg_desired_capacity: 2 asg_max_size: 3 - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 75 author: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 75 diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/full-set-heavyweight.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/full-set-heavyweight.yaml index 052dc70f..ce83ffd6 100644 --- a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/full-set-heavyweight.yaml +++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk11/full-set-heavyweight.yaml @@ -11,12 +11,12 @@ publish: asg_min_size: 3 asg_desired_capacity: 3 asg_max_size: 6 - instance_type: m4.2xlarge + instance_type: m5.2xlarge root_vol_size: 50 data_vol_size: 100 author: - instance_type: m4.2xlarge + instance_type: m5.2xlarge root_vol_size: 50 data_vol_size: 100 diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/full-set-heavyweight.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/full-set-heavyweight.yaml index 052dc70f..ce83ffd6 100644 --- a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/full-set-heavyweight.yaml +++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/full-set-heavyweight.yaml @@ -11,12 +11,12 @@ publish: asg_min_size: 3 asg_desired_capacity: 3 asg_max_size: 6 - instance_type: m4.2xlarge + instance_type: m5.2xlarge root_vol_size: 50 data_vol_size: 100 author: - instance_type: m4.2xlarge + instance_type: m5.2xlarge root_vol_size: 50 data_vol_size: 100 diff --git a/aem-aws-stack-builder/aem-reconfiguration-aem64/consolidated.yaml b/aem-aws-stack-builder/aem-reconfiguration-aem64/consolidated.yaml index 82d6fdca..f5a47993 100644 --- a/aem-aws-stack-builder/aem-reconfiguration-aem64/consolidated.yaml +++ b/aem-aws-stack-builder/aem-reconfiguration-aem64/consolidated.yaml @@ -127,7 +127,7 @@ saml: file: s3://aem-opencloud/certs/saml_certificate.crt author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 100 tag_name: AEM Author Publish Dispatcher diff --git a/aem-aws-stack-builder/aem-testing-blue-green-aem64/full-set.yaml b/aem-aws-stack-builder/aem-testing-blue-green-aem64/full-set.yaml index b121a842..0a548665 100644 --- a/aem-aws-stack-builder/aem-testing-blue-green-aem64/full-set.yaml +++ b/aem-aws-stack-builder/aem-testing-blue-green-aem64/full-set.yaml @@ -162,7 +162,7 @@ publish_dispatcher: enable_random_termination: false publish: - instance_type: m4.xlarge + instance_type: m5.xlarge asg_min_size: 2 asg_desired_capacity: 2 asg_max_size: 4 @@ -172,7 +172,7 @@ publish: author: instance_profile: aem-instance-profiles-stack-AuthorInstanceProfile-OYGRS9FHB0L9 - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 100 elb_health_check: HTTPS:5432/system/health?tags=shallow diff --git a/aem-aws-stack-builder/aem-testing-recovery-aem64/full-set.yaml b/aem-aws-stack-builder/aem-testing-recovery-aem64/full-set.yaml index b121a842..0a548665 100644 --- a/aem-aws-stack-builder/aem-testing-recovery-aem64/full-set.yaml +++ b/aem-aws-stack-builder/aem-testing-recovery-aem64/full-set.yaml @@ -162,7 +162,7 @@ publish_dispatcher: enable_random_termination: false publish: - instance_type: m4.xlarge + instance_type: m5.xlarge asg_min_size: 2 asg_desired_capacity: 2 asg_max_size: 4 @@ -172,7 +172,7 @@ publish: author: instance_profile: aem-instance-profiles-stack-AuthorInstanceProfile-OYGRS9FHB0L9 - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 100 elb_health_check: HTTPS:5432/system/health?tags=shallow diff --git a/aem-aws-stack-builder/aem-upgrade-export-aem64/consolidated.yaml b/aem-aws-stack-builder/aem-upgrade-export-aem64/consolidated.yaml index e0098a48..c90bd665 100644 --- a/aem-aws-stack-builder/aem-upgrade-export-aem64/consolidated.yaml +++ b/aem-aws-stack-builder/aem-upgrade-export-aem64/consolidated.yaml @@ -127,7 +127,7 @@ saml: file: s3://aem-opencloud/certs/saml_certificate.crt author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 100 tag_name: AEM Author Publish Dispatcher diff --git a/aem-aws-stack-builder/aem-upgrade-import-aem64/consolidated.yaml b/aem-aws-stack-builder/aem-upgrade-import-aem64/consolidated.yaml index e0098a48..c90bd665 100644 --- a/aem-aws-stack-builder/aem-upgrade-import-aem64/consolidated.yaml +++ b/aem-aws-stack-builder/aem-upgrade-import-aem64/consolidated.yaml @@ -127,7 +127,7 @@ saml: file: s3://aem-opencloud/certs/saml_certificate.crt author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 100 tag_name: AEM Author Publish Dispatcher diff --git a/aem-aws-stack-builder/aem-upgrade-import-aem65/consolidated.yaml b/aem-aws-stack-builder/aem-upgrade-import-aem65/consolidated.yaml index e0098a48..c90bd665 100644 --- a/aem-aws-stack-builder/aem-upgrade-import-aem65/consolidated.yaml +++ b/aem-aws-stack-builder/aem-upgrade-import-aem65/consolidated.yaml @@ -127,7 +127,7 @@ saml: file: s3://aem-opencloud/certs/saml_certificate.crt author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 100 tag_name: AEM Author Publish Dispatcher diff --git a/aem-aws-stack-builder/aem-upgrade-in-place-aem62-aem64/consolidated.yaml b/aem-aws-stack-builder/aem-upgrade-in-place-aem62-aem64/consolidated.yaml index b8d37cad..067833fb 100644 --- a/aem-aws-stack-builder/aem-upgrade-in-place-aem62-aem64/consolidated.yaml +++ b/aem-aws-stack-builder/aem-upgrade-in-place-aem62-aem64/consolidated.yaml @@ -127,7 +127,7 @@ saml: file: s3://aem-opencloud/certs/saml_certificate.crt author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 100 tag_name: AEM Author Publish Dispatcher diff --git a/aem-aws-stack-builder/aem-upgrade-in-place-aem63-aem64/consolidated.yaml b/aem-aws-stack-builder/aem-upgrade-in-place-aem63-aem64/consolidated.yaml index b8d37cad..067833fb 100644 --- a/aem-aws-stack-builder/aem-upgrade-in-place-aem63-aem64/consolidated.yaml +++ b/aem-aws-stack-builder/aem-upgrade-in-place-aem63-aem64/consolidated.yaml @@ -127,7 +127,7 @@ saml: file: s3://aem-opencloud/certs/saml_certificate.crt author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 100 tag_name: AEM Author Publish Dispatcher diff --git a/aem-aws-stack-builder/aem-upgrade-in-place-aem64-aem65/consolidated.yaml b/aem-aws-stack-builder/aem-upgrade-in-place-aem64-aem65/consolidated.yaml index b8d37cad..067833fb 100644 --- a/aem-aws-stack-builder/aem-upgrade-in-place-aem64-aem65/consolidated.yaml +++ b/aem-aws-stack-builder/aem-upgrade-in-place-aem64-aem65/consolidated.yaml @@ -127,7 +127,7 @@ saml: file: s3://aem-opencloud/certs/saml_certificate.crt author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 100 tag_name: AEM Author Publish Dispatcher diff --git a/aem-aws-stack-builder/src/apps/aem/consolidated-heavyweight.yaml b/aem-aws-stack-builder/src/apps/aem/consolidated-heavyweight.yaml index b84cbc82..ac214b51 100644 --- a/aem-aws-stack-builder/src/apps/aem/consolidated-heavyweight.yaml +++ b/aem-aws-stack-builder/src/apps/aem/consolidated-heavyweight.yaml @@ -1,5 +1,5 @@ --- author_publish_dispatcher: - instance_type: m4.2xlarge + instance_type: m5.2xlarge root_vol_size: 50 data_vol_size: 200 diff --git a/aem-aws-stack-builder/src/apps/aem/consolidated-lightweight.yaml b/aem-aws-stack-builder/src/apps/aem/consolidated-lightweight.yaml index c92d8a04..66d3ff0d 100644 --- a/aem-aws-stack-builder/src/apps/aem/consolidated-lightweight.yaml +++ b/aem-aws-stack-builder/src/apps/aem/consolidated-lightweight.yaml @@ -1,5 +1,5 @@ --- author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 150 diff --git a/aem-aws-stack-builder/src/apps/aem/full-set-heavyweight.yaml b/aem-aws-stack-builder/src/apps/aem/full-set-heavyweight.yaml index 052dc70f..ce83ffd6 100644 --- a/aem-aws-stack-builder/src/apps/aem/full-set-heavyweight.yaml +++ b/aem-aws-stack-builder/src/apps/aem/full-set-heavyweight.yaml @@ -11,12 +11,12 @@ publish: asg_min_size: 3 asg_desired_capacity: 3 asg_max_size: 6 - instance_type: m4.2xlarge + instance_type: m5.2xlarge root_vol_size: 50 data_vol_size: 100 author: - instance_type: m4.2xlarge + instance_type: m5.2xlarge root_vol_size: 50 data_vol_size: 100 diff --git a/aem-aws-stack-builder/src/apps/aem/full-set-lightweight.yaml b/aem-aws-stack-builder/src/apps/aem/full-set-lightweight.yaml index 2b2ef99a..deba120e 100644 --- a/aem-aws-stack-builder/src/apps/aem/full-set-lightweight.yaml +++ b/aem-aws-stack-builder/src/apps/aem/full-set-lightweight.yaml @@ -11,12 +11,12 @@ publish: asg_min_size: 2 asg_desired_capacity: 2 asg_max_size: 3 - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 75 author: - instance_type: m4.xlarge + instance_type: m5.xlarge root_vol_size: 30 data_vol_size: 75 diff --git a/aem-aws-stack-builder/src/apps/aem/os-amazon-linux2.yaml b/aem-aws-stack-builder/src/apps/aem/os-amazon-linux2.yaml index 63a2fe6c..d14510df 100644 --- a/aem-aws-stack-builder/src/apps/aem/os-amazon-linux2.yaml +++ b/aem-aws-stack-builder/src/apps/aem/os-amazon-linux2.yaml @@ -5,16 +5,16 @@ publish_dispatcher: instance_type: t3.micro publish: - instance_type: m4.large + instance_type: m5.large author: - instance_type: m4.large + instance_type: m5.large author_dispatcher: instance_type: t3.micro author_publish_dispatcher: - instance_type: m4.xlarge + instance_type: m5.xlarge orchestrator: instance_type: t3.small