Merge ~dnegreira/stsstack-bundles:resources-renderer into stsstack-bundles:master

[David Negreira]

We are not including the common/render.d/resources anywhere in the code, so the function render_resources_path() its not available when necessary.
This change aims to add it to render_resources_path() function to common/render.d/all to ensure its loaded and used when necessary.

[Edward Hope-Morley (hopem)]

Hi david, thanks for submitting this patch. Your approach does fix it but actually the correct way is:

diff --git a/common/generate_bundle_base b/common/generate_bundle_base
index abf49e6..4ab1472 100644
--- a/common/generate_bundle_base
+++ b/common/generate_bundle_base
@@ -79,10 +79,10 @@ fi
 RENDER_PARTS_DIR=$bundles_dir/parts
 mkdir -p $RENDER_PARTS_DIR
 . $MOD_DIR/common/render.d/all
+. $MOD_DIR/common/render.d/resources
 if ${MASTER_OPTS[HYPERCONVERGED_DEPLOYMENT]}; then
     PLACEMENT_OVERLAYS_DIR=$bundles_dir/p
     mkdir -p $PLACEMENT_OVERLAYS_DIR
- . $MOD_DIR/common/render.d/resources
     . $MOD_DIR/common/render.d/unit_placement
 fi

review: Needs Fixing

[David Negreira (dnegreira)]

Hi Ed, thanks for your comment, I fixed it as suggested and did a force-push

[Edward Hope-Morley (hopem)]

review: Approve

diff --git a/common/generate_bundle_base b/common/generate_bundle_base
index abf49e6..4ab1472 100644
--- a/common/generate_bundle_base
+++ b/common/generate_bundle_base
@@ -79,10 +79,10 @@ fi
 RENDER_PARTS_DIR=$bundles_dir/parts
 mkdir -p $RENDER_PARTS_DIR
 . $MOD_DIR/common/render.d/all
+. $MOD_DIR/common/render.d/resources
 if ${MASTER_OPTS[HYPERCONVERGED_DEPLOYMENT]}; then
     PLACEMENT_OVERLAYS_DIR=$bundles_dir/p
     mkdir -p $PLACEMENT_OVERLAYS_DIR
-    . $MOD_DIR/common/render.d/resources
     . $MOD_DIR/common/render.d/unit_placement
 fi