Skip to content

Commit

Permalink
[CE-498]JSON connection profile misses few quotes
Browse files Browse the repository at this point in the history
Ansible agent created json connection profiles missed
few double quotes and also missing escape slash. This
patch fixes the problem.

Change-Id: Idd280668bc71f25b27bdd27b8c71943ce3af518d
Signed-off-by: Tong Li <[email protected]>
  • Loading branch information
Tong Li committed Nov 9, 2018
1 parent 8faf345 commit 83e8ea7
Showing 1 changed file with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,20 @@
"entityMatchers": {
"orderer": [
{% for orderer in allorderers %}
{ mappedHost: "{{ orderer.name }}",
pattern: (\w*){{ orderer.name }}(\w*),
sslTargetOverrideUrlSubstitutionExp: {{ orderer.name }},
urlSubstitutionExp: "{{ tls|ternary('grpcs','grpc') }}://{{ allips|random }}:{{ k8sports[orderer.name+':7050'] }}"
{ "mappedHost": "{{ orderer.name }}",
"pattern": "(\\w*){{ orderer.name }}(\\w*)",
"sslTargetOverrideUrlSubstitutionExp": "{{ orderer.name }}",
"urlSubstitutionExp": "{{ tls|ternary('grpcs','grpc') }}://{{ allips|random }}:{{ k8sports[orderer.name+':7050'] }}"
}{{ '' if loop.last else ',' }}
{% endfor %}
],
"peer": [
{% for peer in allpeers|selectattr('org', 'equalto', item)|list %}
{ mappedHost: "{{ peer.name }}"
pattern: (\w*){{ peer.name }}(\w*),
sslTargetOverrideUrlSubstitutionExp: {{ peer.name }},
urlSubstitutionExp: "{{ tls|ternary('grpcs','grpc') }}://{{ allips|random }}:{{ k8sports[peer.name+':7051'] }}",
eventUrlSubstitutionExp: "{{ tls|ternary('grpcs','grpc') }}://{{ allips|random }}:{{ k8sports[peer.name+':7053'] }}"
{ "mappedHost": "{{ peer.name }}",
"pattern": "(\\w*){{ peer.name }}(\\w*)",
"sslTargetOverrideUrlSubstitutionExp": "{{ peer.name }}",
"urlSubstitutionExp": "{{ tls|ternary('grpcs','grpc') }}://{{ allips|random }}:{{ k8sports[peer.name+':7051'] }}",
"eventUrlSubstitutionExp": "{{ tls|ternary('grpcs','grpc') }}://{{ allips|random }}:{{ k8sports[peer.name+':7053'] }}"
}{{ '' if loop.last else ',' }}
{% endfor %}
]
Expand Down

0 comments on commit 83e8ea7

Please sign in to comment.