templating corrections

Author: Kayobe deployment user

examples/templates/images.j2

@@ -3,7 +3,7 @@
 
 {% for item in new_template_data %}
 # Image for {{ item.key }}
-{{ item.value.name }}:
+{{ item.value.name |  replace('-', '_') | replace('.', '_') }}:
   name: "{{ item.value.name }}"
   type: qcow2
   image_url: "{{ item.value.url }}"
@@ -18,11 +18,11 @@
 kubernetes_images:
 {% if matching_images is defined and matching_temps | length > 0 %}
 {% for item in matching_images %}
-{% if item.value.name not in new_template_data | map(attribute='value.name') %}
+{% if (item.value.name | replace('_', '-')) not in (new_template_data | map(attribute='value.name')) %}
   - "{{ '{{ ' + item.key + ' }}' }}"
 {% endif %}
 {% endfor %}
 {% endif %}
 {% for item in new_template_data %}
-  - "{{ '{{ ' + item.value.name + ' }}' }}"
-{% endfor %}
+  - "{{ '{{ ' + (item.value.name | replace('-', '_')) | replace('.', '_') + ' }}' }}"
+{% endfor %}

examples/templates/old-images.j2

@@ -3,7 +3,7 @@
 # Old magnum images - hide until out of use
 
 {% for item in matching_images %}
-{% if item.value.name not in new_template_data | map(attribute='value.name') %}
+{% if item.value.name not in new_template_data | map(attribute='value.name') | replace('-', '_') %}
 {{ item.key }}:
 {% for key, value in item.value.items() %}
 {% if value is mapping %}
@@ -18,4 +18,4 @@
 
 {% endif %}
 {% endfor %}
-{% endif %}
+{% endif %}

examples/templates/old-templates.j2

@@ -3,7 +3,7 @@
 # Old magnum templates - hide until out of use
 
 {% for item in matching_temps %}
-{% if item.key not in new_template_data | map(attribute='key') %}
+{% if item.key not in new_template_data | map(attribute='key') | replace('-', '_') %}
 {{ item.key }}:
 {% for key, value in item.value.items() %}
 {% if key == 'is_hidden' %}
@@ -23,4 +23,4 @@ is_hidden: True
 
 {% endif %}
 {% endfor %}
-{% endif %}
+{% endif %}

examples/templates/templates.j2

@@ -2,7 +2,7 @@
 # Configuration of Magnum container clusters.
 
 {% for item in new_template_data %}
-{{ item.key }}:
+{{ item.key | replace('-', '_') }}:
   labels:
     monitoring_enabled: "true"
     kube_dashboard_enabled: "true"
@@ -26,11 +26,11 @@
 openstack_container_clusters_templates:
 {% if matching_temps is defined and matching_temps | length > 0 %}
 {% for item in matching_temps %}
-{% if item.key not in new_template_data | map(attribute='key') %}
+{% if (item.key| replace('_', '-')) not in (new_template_data | map(attribute='key')) %}
   - "{{ '{{ ' + item.key + ' }}' }}"
 {% endif %}
 {% endfor %}
 {% endif %}
 {% for item in new_template_data %}
-  - "{{ '{{ ' + item.key + ' }}' }}"
-{% endfor %}
+  - "{{ '{{ ' + (item.key| replace('-', '_')) + ' }}' }}"
+{% endfor %}

tools/merge_config/bin/activate

@@ -13,10 +13,15 @@ if [ -f "$CONFIG_ROOT/tools/merge_config/clouds.yaml" ]; then
 fi
 
 # If a Python virtualenv exists, activate it
+if [[ "$VIRTUAL_ENV" != "" ]]; then
+  VENV=$VIRTUAL_ENV
+fi
+
 VENV="${VENV:-"$CONFIG_ROOT/tools/merge_config/.venv"}"
+
 if [ -f "$VENV/bin/activate" ]; then
   echo "Activating Python venv at $VENV"
   source "$VENV/bin/activate"
 fi
 
-echo "Activated environment"
+echo "Activated environment"

tools/merge_config/bin/run

@@ -6,4 +6,4 @@ source $CONFIG_ROOT/tools/merge_config/bin/activate
 
 export ANSIBLE_CONFIG=$CONFIG_ROOT/tools/merge_config/ansible.cfg
 
-ansible-playbook $CONFIG_ROOT/tools/merge_config/merge_templates.yml 
+ansible-playbook $CONFIG_ROOT/tools/merge_config/merge_templates.yml