diff options
Diffstat (limited to 'docker/neutron')
7 files changed, 15 insertions, 15 deletions
diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index 2967222f4..024a6d2f8 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -28,10 +28,10 @@ COPY supervisord.conf /etc/supervisor/ # main neutron.conf if we wish COPY fwaas_driver.ini /etc/neutron/ -COPY neutron-dhcp-agent/ /opt/kolla/neutron-dhcp-agent -COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent -COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent -COPY config-sudoers.sh /opt/kolla/ +COPY neutron-dhcp-agent/ /var/lib/kolla/neutron-dhcp-agent +COPY neutron-l3-agent/ /var/lib/kolla/neutron-l3-agent +COPY neutron-metadata-agent/ /var/lib/kolla/neutron-metadata-agent +COPY config-sudoers.sh /var/lib/kolla/ COPY start.sh / diff --git a/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh index 96ecd80e6..474b6a0b4 100755 --- a/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh +++ b/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh @@ -2,7 +2,7 @@ set -o errexit # Loading common functions. -source /opt/kolla/config-sudoers.sh +source /var/lib/kolla/config-sudoers.sh # Will be removed when neutron-agents is a thin container CMD="/usr/bin/neutron-dhcp-agent" diff --git a/docker/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/neutron/neutron-agents/neutron-l3-agent/start.sh index aa73b090b..0ba99d1fd 100755 --- a/docker/neutron/neutron-agents/neutron-l3-agent/start.sh +++ b/docker/neutron/neutron-agents/neutron-l3-agent/start.sh @@ -2,7 +2,7 @@ set -o errexit # Loading common functions. -source /opt/kolla/config-sudoers.sh +source /var/lib/kolla/config-sudoers.sh # Will be removed when this container is broken out into thin containers CMD="/usr/bin/neutron-l3-agent" diff --git a/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh index d94f767e2..8a0b5e938 100755 --- a/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh +++ b/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh @@ -2,7 +2,7 @@ set -o errexit # Loading common functions. -source /opt/kolla/config-sudoers.sh +source /var/lib/kolla/config-sudoers.sh # Will be removed when this container is broken out in thin containers CMD="/usr/bin/neutron-metadata-agent" diff --git a/docker/neutron/neutron-agents/start.sh b/docker/neutron/neutron-agents/start.sh index baf3d2a8e..e15650659 100755 --- a/docker/neutron/neutron-agents/start.sh +++ b/docker/neutron/neutron-agents/start.sh @@ -1,7 +1,7 @@ #!/bin/bash set -o errexit -# Processing /opt/kolla/config_files/config.json -python /opt/kolla/set_configs.py +# Processing /var/lib/kolla/config_files/config.json +python /usr/local/bin/kolla_set_configs exec /usr/bin/supervisord diff --git a/docker/neutron/neutron-agents/supervisord.conf b/docker/neutron/neutron-agents/supervisord.conf index 5cab8f5dc..b7a808b3a 100644 --- a/docker/neutron/neutron-agents/supervisord.conf +++ b/docker/neutron/neutron-agents/supervisord.conf @@ -19,21 +19,21 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface serverurl = unix:///var/run/supervisor.sock [program:neutron-dhcp-agent] -command=/opt/kolla/neutron-dhcp-agent/start.sh +command=/var/lib/kolla/neutron-dhcp-agent/start.sh priority=40 startsec=10 stderr_events_enabled=true stdout_events_enabled=true [program:neutron-metadata-agent] -command=/opt/kolla/neutron-metadata-agent/start.sh +command=/var/lib/kolla/neutron-metadata-agent/start.sh priority=40 startsec=10 stderr_events_enabled=true stdout_events_enabled=true [program:neutron-l3-agent] -command=/opt/kolla/neutron-l3-agent/start.sh +command=/var/lib/kolla/neutron-l3-agent/start.sh priority=40 startsec=10 stderr_events_enabled=true diff --git a/docker/neutron/neutron-base/ip_wrapper.py b/docker/neutron/neutron-base/ip_wrapper.py index 871c615ab..33177d03e 100644 --- a/docker/neutron/neutron-base/ip_wrapper.py +++ b/docker/neutron/neutron-base/ip_wrapper.py @@ -35,7 +35,7 @@ def host_mnt_exec(cmd): nsenter.Namespace( '1', 'mnt', - proc='/opt/kolla/host_proc/')) + proc='/var/lib/kolla/host_proc/')) process_ = subprocess.Popen(cmd) except Exception as e: @@ -57,9 +57,9 @@ if len(sys.argv) > 2: cmd = ["/usr/bin/env", "ip"] + sys.argv[1:] sys.exit(host_mnt_exec(cmd).returncode) else: - cmd = ["/opt/kolla/ip"] + sys.argv[1:] + cmd = ["/var/lib/kolla/ip"] + sys.argv[1:] else: - cmd = ["/opt/kolla/ip"] + cmd = ["/var/lib/kolla/ip"] if len(sys.argv) == 2: cmd = cmd + sys.argv[1:] |