Fix/aem resource aem id handling (#63)

* Added new parameter aem_id for several aem_curator::action manifests.

* Changelog update

Regarding issue
shinesolutions/puppet-aem-resources#27

* Added new parameter for action manifest download_artifacts.

CHANGELOG.md

@@ -1,5 +1,5 @@
 ### 2.4.9
-*
+*  Fix AEM Package download and install due to missing template parameters
 
 ### 2.4.8
 * Fix dispatchers broken provisioning due to missing template parameter

data/author-primary.yaml

@@ -1,22 +1,34 @@
 ---
+author_primary::aem_id: author
 author_primary::base_dir: "%{hiera('common::base_dir')}"
+
 author_primary::aem_repo_devices:
   - device_name: /dev/sdb
-    aem_id: author
+    aem_id: "%{hiera('author_primary::aem_id')}"
 
 aem_curator::action_enable_crxde::aem_instances:
   - run_mode: author
-    aem_id: author
+    aem_id: "%{hiera('author_primary::aem_id')}"
+
 aem_curator::action_disable_crxde::aem_instances:
   - run_mode: author
-    aem_id: author
+    aem_id: "%{hiera('author_primary::aem_id')}"
+
+aem_curator::action_deploy_artifacts::aem_id: "%{hiera('author_primary::aem_id')}"
+
+aem_curator::action_deploy_artifact::aem_id: "%{hiera('author_primary::aem_id')}"
+
+aem_curator::action_download_artifacts::aem_id: "%{hiera('author_primary::aem_id')}"
 
 aem_curator::action_export_backup::tmp_dir: "%{hiera('common::tmp_dir')}"
+aem_curator::action_export_backup::aem_id: "%{hiera('author_primary::aem_id')}"
 
 aem_curator::action_export_backups::tmp_dir: "%{hiera('common::tmp_dir')}"
 aem_curator::action_export_backups::download_descriptor::tmp_dir: "%{hiera('common::tmp_dir')}"
+aem_curator::action_export_backups::aem_id: "%{hiera('author_primary::aem_id')}"
 
 aem_curator::action_import_backup::tmp_dir: "%{hiera('common::tmp_dir')}"
+aem_curator::action_import_backup::aem_id: "%{hiera('author_primary::aem_id')}"
 
 aem_curator::action_promote_author_standby_to_primary::base_dir: "%{hiera('common::base_dir')}"
 aem_curator::action_promote_author_standby_to_primary::tmp_dir: "%{hiera('common::tmp_dir')}"
@@ -28,7 +40,7 @@ aem_curator::config_aem_tools::aem_instances:
   - crx_quickstart_dir: /opt/aem/author/crx-quickstart
     user: aem-author
 aem_curator::config_collectd::aem_instances:
-  - aem_id: author
+  - aem_id: "%{hiera('author_primary::aem_id')}"
     jmxremote_port: "%{hiera('aem_curator::config_author_primary::jmxremote_port')}"
     instance_prefixes:
       - memory-heap

data/author-standby.yaml

@@ -1,22 +1,34 @@
 ---
+author_standby::aem_id: author
 author_standby::base_dir: "%{hiera('common::base_dir')}"
+
 author_standby::aem_repo_devices:
   - device_name: /dev/sdb
-    aem_id: author
+    aem_id: "%{hiera('author_standby::aem_id')}"
 
 aem_curator::action_enable_crxde::aem_instances:
   - run_mode: author
-    aem_id: author
+    aem_id: "%{hiera('author_standby::aem_id')}"
+
 aem_curator::action_disable_crxde::aem_instances:
   - run_mode: author
-    aem_id: author
+    aem_id: "%{hiera('author_standby::aem_id')}"
+
+aem_curator::action_deploy_artifacts::aem_id: "%{hiera('author_standby::aem_id')}"
+
+aem_curator::action_deploy_artifact::aem_id: "%{hiera('author_standby::aem_id')}"
+
+aem_curator::action_download_artifacts::aem_id: "%{hiera('author_standby::aem_id')}"
 
 aem_curator::action_export_backup::tmp_dir: "%{hiera('common::tmp_dir')}"
+aem_curator::action_export_backup::aem_id: "%{hiera('author_standby::aem_id')}"
 
 aem_curator::action_export_backups::tmp_dir: "%{hiera('common::tmp_dir')}"
 aem_curator::action_export_backups::download_descriptor::tmp_dir: "%{hiera('common::tmp_dir')}"
+aem_curator::action_export_backups::aem_id: "%{hiera('author_standby::aem_id')}"
 
 aem_curator::action_import_backup::tmp_dir: "%{hiera('common::tmp_dir')}"
+aem_curator::action_import_backup::aem_id: "%{hiera('author_standby::aem_id')}"
 
 aem_curator::action_promote_author_standby_to_primary::base_dir: "%{hiera('common::base_dir')}"
 aem_curator::action_promote_author_standby_to_primary::tmp_dir: "%{hiera('common::tmp_dir')}"
@@ -28,7 +40,7 @@ aem_curator::config_aem_tools::aem_instances:
   - crx_quickstart_dir: /opt/aem/author/crx-quickstart
     user: aem-author
 aem_curator::config_collectd::aem_instances:
-  - aem_id: author
+  - aem_id: "%{hiera('author_standby::aem_id')}"
     jmxremote_port: "%{hiera('aem_curator::config_author_standby::jmxremote_port')}"
     instance_prefixes:
       - standby-status

data/publish.yaml

@@ -1,29 +1,40 @@
 ---
+publish::aem_id: publish
 publish::base_dir: "%{hiera('common::base_dir')}"
+
 publish::aem_repo_devices:
   - device_name: /dev/sdb
-    aem_id: publish
+    aem_id: "%{hiera('publish::aem_id')}"
 
 aem_curator::action_enable_crxde::aem_instances:
   - run_mode: publish
-    aem_id: publish
+    aem_id: "%{hiera('publish::aem_id')}"
 
 aem_curator::action_disable_crxde::aem_instances:
   - run_mode: publish
-    aem_id: publish
+    aem_id: "%{hiera('publish::aem_id')}"
+
+aem_curator::action_deploy_artifacts::aem_id: "%{hiera('publish::aem_id')}"
+
+aem_curator::action_deploy_artifact::aem_id: "%{hiera('publish::aem_id')}"
+
+aem_curator::action_download_artifacts::aem_id: "%{hiera('publish::aem_id')}"
 
 aem_curator::action_export_backup::tmp_dir: "%{hiera('common::tmp_dir')}"
+aem_curator::action_export_backup::aem_id: "%{hiera('publish::aem_id')}"
 
 aem_curator::action_export_backups::tmp_dir: "%{hiera('common::tmp_dir')}"
 aem_curator::action_export_backups::download_descriptor::tmp_dir: "%{hiera('common::tmp_dir')}"
+aem_curator::action_export_backups::aem_id: "%{hiera('publish::aem_id')}"
 
 aem_curator::action_import_backup::tmp_dir: "%{hiera('common::tmp_dir')}"
+aem_curator::action_import_backup::aem_id: "%{hiera('publish::aem_id')}"
 
 aem_curator::config_aem_tools::aem_instances:
   - crx_quickstart_dir: /opt/aem/publish/crx-quickstart
     user: aem-publish
 aem_curator::config_collectd::aem_instances:
-  - aem_id: publish
+  - aem_id: "%{hiera('publish::aem_id')}"
     jmxremote_port: "%{hiera('aem_curator::config_publish::jmxremote_port')}"
     instance_prefixes:
       - memory-heap