summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2018-08-21 14:55:44 +0800
committerJulien <zhang.jun3g@zte.com.cn>2018-08-21 14:58:22 +0800
commit66786e0de4a2edf4dfce2596d4c0e6f5ec844e24 (patch)
treeaf59c319f8c117d37921365e4a89f1197ce0ced8
parentf96e6c53d8786bcb11196d8180635d993765733d (diff)
Fix trailing spaces issue when generates yml files
There are some missing coniguration in jinja2 template, which will cause the trailing spaces issues. Currently just add some comments in the end. Change-Id: I4fe250cda1192d7c6e7cead0251ac5e7978cd310 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
-rw-r--r--config/installers/compass4nfv/network_ocl.yml.j22
-rw-r--r--config/installers/joid/pod_config.yaml.j28
2 files changed, 5 insertions, 5 deletions
diff --git a/config/installers/compass4nfv/network_ocl.yml.j2 b/config/installers/compass4nfv/network_ocl.yml.j2
index f435538..949b491 100644
--- a/config/installers/compass4nfv/network_ocl.yml.j2
+++ b/config/installers/compass4nfv/network_ocl.yml.j2
@@ -31,7 +31,7 @@ sys_intf_mappings:
- name: storage
interface: eth2
- vlan_tag: {{ conf['nodes'][0]['interfaces'][1]['vlan'] }}
+ vlan_tag: {{ conf['nodes'][0]['interfaces'][1]['vlan'] }} # not a good fit
type: vlan
role:
- controller
diff --git a/config/installers/joid/pod_config.yaml.j2 b/config/installers/joid/pod_config.yaml.j2
index 26f775d..1ba966d 100644
--- a/config/installers/joid/pod_config.yaml.j2
+++ b/config/installers/joid/pod_config.yaml.j2
@@ -149,9 +149,9 @@ lab:
feature: odl_l2
spaces:
- type: admin # admin
- bridge: {{ net_config.admin.bridge }}
+ bridge: {{ net_config.admin.bridge }} # admin bridge
cidr: {{ net_config.admin.network }}/{{ net_config.admin.mask }}
- gateway: {{ net_config.admin.gateway }}
+ gateway: {{ net_config.admin.gateway }} # admin gateway
vlan:
- type: data # mgmt
cidr: {{ net_config.mgmt.network }}/{{ net_config.mgmt.mask }}
@@ -162,11 +162,11 @@ lab:
gateway:
vlan:
- type: floating # private
- bridge: {{ net_config.private.bridge }}
+ bridge: {{ net_config.private.bridge }} # private bridge
cidr: {{ net_config.private.network }}/{{ net_config.private.mask }}
gateway:
vlan:
- type: public # public
cidr: {{ net_config.public.network }}/{{ net_config.public.mask }}
gateway: {{ net_config.public.gateway }}
- vlan: {% if net_config.public.vlan | int > 0 %}{{ net_config.public.vlan }}{% endif %}
+ vlan: {% if net_config.public.vlan | int > 0 %}{{ net_config.public.vlan }}{% endif %} # public vlan