openstack
/
kolla-kubernetes
Code Issues Proposed changes

Merge "Fixing neutron-openvswitch missing mount and variable"

This commit is contained in:
Jenkins 2016-10-03 12:32:43 +00:00 committed by Gerrit Code Review
parent 3deb9dab04 2da15fbb2c
commit 42cf0a3870
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
services/neutron/neutron-openvswitch-agent-daemonset.yml.j2
View File

@ -29,7 +29,7 @@ spec:
TUNNEL_INTERFACE={{ tunnel_interface }};
F=/var/lib/kolla-kubernetes/neutron-openvswitch-agent/tunnel_interface;
[ -f $F ] && TUNNEL_INTERFACE=$(<$F);
IP=$(ip addr list {{ tunnel_interface }} | grep ''inet '' |cut -d'' '' -f6|cut -d/ -f1);
IP=$(ip addr list \"''$TUNNEL_INTERFACE''\" | grep ''inet '' |cut -d'' '' -f6|cut -d/ -f1);
{%- if enable_openvswitch_tcp == "yes" -%}
crudini --set /srv/pod-main-config/ml2_conf.ini ovs ovsdb_connection tcp:$IP:6640;
{%- endif -%}
@ -43,6 +43,10 @@ spec:
{
"name": "pod-main-config",
"mountPath": "/srv/pod-main-config"
},
{
"name": "host-var-lib-kk",
"mountPath": "/var/lib/kolla-kubernetes"
}
]
},
@ -160,3 +164,6 @@ spec:
- name: host-lib-modules
hostPath:
path: /lib/modules
- name: host-var-lib-kk
hostPath:
path: /var/lib/kolla-kubernetes