diff options
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/centos/binary/neutron/neutron-base/ip_wrapper.py | 4 | ||||
| -rwxr-xr-x | docker/common/hautoproxy/start.py | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/docker/centos/binary/neutron/neutron-base/ip_wrapper.py b/docker/centos/binary/neutron/neutron-base/ip_wrapper.py index 94d54d4e0..591fca6f4 100755 --- a/docker/centos/binary/neutron/neutron-base/ip_wrapper.py +++ b/docker/centos/binary/neutron/neutron-base/ip_wrapper.py @@ -21,9 +21,9 @@ # This is required for "thin" neutron containers to function properly -import sys -import subprocess import nsenter +import subprocess +import sys def host_mnt_exec(cmd): diff --git a/docker/common/hautoproxy/start.py b/docker/common/hautoproxy/start.py index bbdd876b5..914a2ffac 100755 --- a/docker/common/hautoproxy/start.py +++ b/docker/common/hautoproxy/start.py @@ -1,12 +1,25 @@ #!/usr/bin/python +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + '''This script configures and starts a local haproxy instances, bound to 127.0.0.1, that forwards connections all of the discovered docker/kubernetes environment variables.''' import argparse +from jinja2 import Environment +from jinja2 import FileSystemLoader import os -from jinja2 import Environment, FileSystemLoader import re import urlparse |