Include localstorage container in case non Ceph

Since localstorage provisioners are not used in case of Ceph deployed
no need to load it's provider container images.

Change-Id: Id220a2576b179d977310783b13b0781c71be63c9
Signed-off-by: Krisztian Lengyel <krisztian.lengyel@nokia.com>

diff --git a/ansible/roles/install_caas_infra/defaults/main.yaml b/ansible/roles/install_caas_infra/defaults/main.yaml
index fcef890..5441dbd 100644 (file)
--- a/ansible/roles/install_caas_infra/defaults/main.yaml
+++ b/ansible/roles/install_caas_infra/defaults/main.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-infra_chart_images:
+base_infra_chart_images:
   - cpupooler
   - custom_metrics
   - elasticsearch
@@ -21,8 +21,10 @@ infra_chart_images:
   - prometheus
   - sriovdp
   - fluentd
+  - hyperdanm
+localatorage_infra_chart_images:
   - storage_local_static_provisioner
   - dynamic_local_pv_provisioner
-  - hyperdanm
+infra_chart_images: "{% if ceph_configured is defined and ceph_configured %}{{ base_infra_chart_images }}{% else %}{{ base_infra_chart_images + localatorage_infra_chart_images }}{% endif %}"
 infra_chart_separated_values:
   - fluentd

diff --git a/infra-charts/values.yaml.j2 b/infra-charts/values.yaml.j2
index 70e726d..1f9e65e 100644 (file)
--- a/infra-charts/values.yaml.j2
+++ b/infra-charts/values.yaml.j2
@@ -119,7 +119,6 @@ localstorage:
   required: false
 {% else %}
   required: true
-{% endif %}
   storagelocalstaticprovisioner:
     local_storage_dir: "{{ caas.local_storage_path }}"
     image_name: {{ container_image_names | select('search', '/storage_local_static_provisioner') | list | last }}
@@ -127,3 +126,4 @@ localstorage:
     local_storage_dir: "{{ caas.local_storage_path }}"
     image_name: {{ container_image_names | select('search', '/dynamic_local_pv_provisioner') | list | last }}
     name: "pv-provisioner"
+{% endif %}