diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-02-06 13:30:29 -0500 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-02-12 19:02:57 -0500 |
| commit | 32ce2b41b1ca0b6224b45d8bf79039db5e15e997 (patch) | |
| tree | 89e901617a15d2d4b4da5a858555be01743f9d9b /templates | |
| parent | 9326e4237f4d161f297dc4493ab4928ea6e2bf0f (diff) | |
Add VPP binding to Honeycomb
Change-Id: Ic44fc66892a8dbab8974ff711a485f4f581b3cbd
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/honeycomb.json.erb | 8 | ||||
| -rw-r--r-- | templates/startup.conf.erb | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/templates/honeycomb.json.erb b/templates/honeycomb.json.erb index 6cf2bc3..7addc09 100644 --- a/templates/honeycomb.json.erb +++ b/templates/honeycomb.json.erb @@ -9,7 +9,7 @@ "restconf-http-enabled": "true", "restconf-root-path": "/restconf", "restconf-binding-address": "127.0.0.1", - "restconf-port": <%= scope.lookupvar('fdio::honeycomb::rest_port') %>, + "restconf-port": <%= scope['fdio::honeycomb::rest_port'] %>, "restconf-https-enabled": "true", "restconf-https-binding-address": "0.0.0.0", "restconf-https-port": 8443, @@ -18,7 +18,7 @@ "restconf-keystore-manager-password": "OBF:1v9s1unr1unn1vv51zlk1t331vg91x1b1vgl1t331zly1vu51uob1uo71v8u", "restconf-truststore": "/honeycomb-keystore", "restconf-truststore-password": "OBF:1v9s1unr1unn1vv51zlk1t331vg91x1b1vgl1t331zly1vu51uob1uo71v8u", - "restconf-websocket-port": <%= scope.lookupvar('fdio::honeycomb::websocket_rest_port') %>, + "restconf-websocket-port": <%= scope['fdio::honeycomb::websocket_rest_port'] %>, "restconf-pool-max-size": 10, "restconf-pool-min-size": 1, "restconf-acceptors-size": 1, @@ -36,6 +36,6 @@ "netconf-ssh-binding-port": 2831, "netconf-notification-stream-name": "honeycomb", - "username": "<%= scope.lookupvar('fdio::honeycomb::user') %>", - "password": "<%= scope.lookupvar('fdio::honeycomb::password') %>" + "username": "<%= scope['fdio::honeycomb::user'] %>", + "password": "<%= scope['fdio::honeycomb::password'] %>" } diff --git a/templates/startup.conf.erb b/templates/startup.conf.erb index e10dea4..46894d0 100644 --- a/templates/startup.conf.erb +++ b/templates/startup.conf.erb @@ -5,15 +5,15 @@ unix { } dpdk { - <% if @vpp_dpdk_devs.is_a? Array -%><% @vpp_dpdk_devs.each do |n| -%> - dev <%=n-%> <% if @vpp_vlan_enabled && system("lspci -s #{n} | grep VIC") -%> {vlan-strip-offload off}<%end%> + <% if scope['fdio::vpp_dpdk_devs'].is_a? Array -%><% scope['fdio::vpp_dpdk_devs'].each do |n| -%> + dev <%=n-%> <% if scope['fdio::vpp_vlan_enabled'] && system("lspci -s #{n} | grep VIC") -%> {vlan-strip-offload off}<%end%> <% end -%><% end -%> - uio-driver <%=@vpp_dpdk_uio_driver%> + uio-driver <%=scope['fdio::vpp_dpdk_uio_driver']%> } cpu { - <% if @vpp_cpu_main_core -%>main-core <%=@vpp_cpu_main_core%> <%end%> - <% if @vpp_cpu_corelist_workers -%>corelist-workers <%=@vpp_cpu_corelist_workers%> <%end%> + <% if scope['fdio::vpp_cpu_main_core'] -%>main-core <%=scope['fdio::vpp_cpu_main_core']%> <%end%> + <% if scope['fdio::vpp_cpu_corelist_workers'] -%>corelist-workers <%=scope['fdio::vpp_cpu_corelist_workers']%> <%end%> } api-trace { |