diff options
Diffstat (limited to 'roles/ands_kaas')
5 files changed, 7 insertions, 7 deletions
diff --git a/roles/ands_kaas/templates/00-block-volumes.yml.j2 b/roles/ands_kaas/templates/00-block-volumes.yml.j2 index 9982d61..f313699 100644 --- a/roles/ands_kaas/templates/00-block-volumes.yml.j2 +++ b/roles/ands_kaas/templates/00-block-volumes.yml.j2 @@ -5,7 +5,7 @@ metadata: annotations: descriptions: "{{ kaas_project }} glusterfs block volumes" objects: -{% for name, vol in kaas_block_volumes.iteritems() %} +{% for name, vol in kaas_block_volumes.items() %} {% set oc_name = vol.name | default(name) | regex_replace('_','-') %} {% if oc_name | regex_search("^" + kaas_project) %} {% set pvname = oc_name %} diff --git a/roles/ands_kaas/templates/00-gfs-volumes.yml.j2 b/roles/ands_kaas/templates/00-gfs-volumes.yml.j2 index 54064e4..485733a 100644 --- a/roles/ands_kaas/templates/00-gfs-volumes.yml.j2 +++ b/roles/ands_kaas/templates/00-gfs-volumes.yml.j2 @@ -6,7 +6,7 @@ metadata: annotations: descriptions: "{{ kaas_project }} glusterfs volumes" objects: -{% for name, vol in kaas_project_volumes.iteritems() %} +{% for name, vol in kaas_project_volumes.items() %} {% set voltypes = kaas_storage_domains | json_query("[*].volumes." + vol.volume + ".type") %} {% set voltype = voltypes[0] | default('host') %} {% set mntpaths = kaas_storage_domains | json_query("[*].volumes." + vol.volume + ".mount") %} diff --git a/roles/ands_kaas/templates/00-local-volumes.yml.j2 b/roles/ands_kaas/templates/00-local-volumes.yml.j2 index a97ffae..ff47501 100644 --- a/roles/ands_kaas/templates/00-local-volumes.yml.j2 +++ b/roles/ands_kaas/templates/00-local-volumes.yml.j2 @@ -6,7 +6,7 @@ metadata: annotations: descriptions: "{{ kaas_project }} local volumes" objects: -{% for name, vol in kaas_project_local_volumes.iteritems() %} +{% for name, vol in kaas_project_local_volumes.items() %} {% set voltypes = kaas_storage_domains | json_query("[*].volumes." + vol.volume + ".type") %} {% set voltype = voltypes[0] | default('host') %} {% set mntpaths = kaas_storage_domains | json_query("[*].volumes." + vol.volume + ".mount") %} diff --git a/roles/ands_kaas/templates/40-kaas-app-builders.yml.j2 b/roles/ands_kaas/templates/40-kaas-app-builders.yml.j2 index 50bef9a..d37c4d6 100644 --- a/roles/ands_kaas/templates/40-kaas-app-builders.yml.j2 +++ b/roles/ands_kaas/templates/40-kaas-app-builders.yml.j2 @@ -13,7 +13,7 @@ metadata: labels: {{ applabels | to_json }} {% endif %} objects: -{% for name, builder in builders.iteritems() %} +{% for name, builder in builders.items() %} {% set isname = builder.name | default(name) | regex_replace('_','-') %} {% set istag = builder.version | default("latest") %} {% set bcname = isname if istag == 'latest' else isname + '-' + istag %} @@ -55,7 +55,7 @@ objects: dockerfilePath: "{{ builder.dockerfile | default('Dockerfile') }}" {% if builder.args is defined %} buildArgs: - {% for arg_name, arg_val in builder.args.iteritems() %} + {% for arg_name, arg_val in builder.args.items() %} - name: "{{ arg_name }}" value: "{{ arg_val }}" {% endfor %} diff --git a/roles/ands_kaas/templates/50-kaas-app-pods.yml.j2 b/roles/ands_kaas/templates/50-kaas-app-pods.yml.j2 index 97f620d..76ba6eb 100644 --- a/roles/ands_kaas/templates/50-kaas-app-pods.yml.j2 +++ b/roles/ands_kaas/templates/50-kaas-app-pods.yml.j2 @@ -15,7 +15,7 @@ metadata: labels: {{ applabels | to_json }} {% endif %} objects: -{% for name, pod in pods.iteritems() %} +{% for name, pod in pods.items() %} {% set kind = pod.kind | default('DeploymentConfig') %} {% set podname = pod.name | default(name) | regex_replace('_','-') %} {% if pod.enabled | default(true) %} @@ -168,7 +168,7 @@ objects: {% endif %} {% if pod.pvc is defined %} volumeClaimTemplates: - {% for name, pvc in pod.pvc.iteritems() %} + {% for name, pvc in pod.pvc.items() %} {% set pvcname = name | regex_replace('_','-') %} {% set pv = kaas_project_local_volumes[pvcname] | default({}) %} {% set oc_name = pv.name | default(pvcname) | regex_replace('_','-') %} |