Move scripts for neutron to docker_templates
Change-Id: Ife6623aab20c4259af28d2b1374fc838b934d053 Partially-Implements: blueprint remove-docker-dir
This commit is contained in:
Steven Dake
parent
6434f19ef2
commit
ce86de9915
@ -1 +0,0 @@
|
||||
../../../../common/neutron/neutron-base/ip_wrapper.py
|
||||
@ -1 +0,0 @@
|
||||
../../../../common/neutron/neutron-base/ip_wrapper.py
|
||||
@ -1,40 +0,0 @@
|
||||
[unix_http_server]
|
||||
file = /var/run/supervisor.sock
|
||||
|
||||
[inet_http_server]
|
||||
port = 127.0.0.1:9001
|
||||
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
logfile = /var/log/supervisor/supervisord.log
|
||||
logfile_maxbytes = 200KB
|
||||
logfile_backups = 1
|
||||
pidfile = /var/run/supervisord.pid
|
||||
childlogdir = /var/log/supervisor
|
||||
|
||||
[rpcinterface:supervisor]
|
||||
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
|
||||
|
||||
[supervisorctl]
|
||||
serverurl = unix:///var/run/supervisor.sock
|
||||
|
||||
[program:neutron-dhcp-agent]
|
||||
command=/opt/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
|
||||
priority=40
|
||||
startsec=10
|
||||
stderr_events_enabled=true
|
||||
stdout_events_enabled=true
|
||||
|
||||
[program:neutron-l3-agent]
|
||||
command=/opt/kolla/neutron-l3-agent/start.sh
|
||||
priority=40
|
||||
startsec=10
|
||||
stderr_events_enabled=true
|
||||
stdout_events_enabled=true
|
||||
@ -1,12 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Neutron uses rootwrap which requires a tty for sudo.
|
||||
# Since the container is running in daemon mode, a tty
|
||||
# is not present and requiretty must be commented out.
|
||||
if [ ! -f /sudo-modified ]; then
|
||||
chmod 0640 /etc/sudoers
|
||||
sed -i '/Defaults requiretty/s/^/#/' /etc/sudoers
|
||||
chmod 0440 /etc/sudoers
|
||||
fi
|
||||
|
||||
touch /sudo-modified
|
||||
@ -1,66 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
# Copyright 2015 Sam Yaple
|
||||
#
|
||||
# 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 file exists because we want to create and delete any network
|
||||
# namespaces from the host mount namespace. This allows the host to
|
||||
# access all of the neutron network namespaces as well as all
|
||||
# containers that bind mount /run/netns from the host.
|
||||
|
||||
# This is required for "thin" neutron containers to function properly
|
||||
|
||||
import nsenter
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
|
||||
def host_mnt_exec(cmd):
|
||||
try:
|
||||
with nsenter.ExitStack() as stack:
|
||||
stack.enter_context(
|
||||
nsenter.Namespace(
|
||||
'1',
|
||||
'mnt',
|
||||
proc='/opt/kolla/host_proc/'))
|
||||
process_ = subprocess.Popen(cmd)
|
||||
|
||||
except Exception as e:
|
||||
print(
|
||||
"An error has occured with a component that Kolla manages."
|
||||
" Please file a bug")
|
||||
print("Error: ", e)
|
||||
|
||||
return process_
|
||||
|
||||
|
||||
if len(sys.argv) > 2:
|
||||
# We catch all commands that ip will accept that refer
|
||||
# to creating or deleteing a Network namespace
|
||||
if str(sys.argv[1]).startswith("net") and (
|
||||
str(sys.argv[2]).startswith("a") or
|
||||
str(sys.argv[2]).startswith("d")):
|
||||
# This cmd is executed in the host mount namespace
|
||||
cmd = ["/usr/bin/env", "ip"] + sys.argv[1:]
|
||||
sys.exit(host_mnt_exec(cmd).returncode)
|
||||
else:
|
||||
cmd = ["/opt/kolla/ip"] + sys.argv[1:]
|
||||
else:
|
||||
cmd = ["/opt/kolla/ip"]
|
||||
|
||||
if len(sys.argv) == 2:
|
||||
cmd = cmd + sys.argv[1:]
|
||||
|
||||
process_ = subprocess.Popen(cmd)
|
||||
sys.exit(process_.returncode)
|
||||
@ -1,13 +0,0 @@
|
||||
#!/bin/bash
|
||||
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/dhcp_agent.ini /opt/kolla/neutron-agents/dnsmasq.conf"
|
||||
TARGET="/etc/neutron/"
|
||||
OWNER="neutron"
|
||||
|
||||
for f in $SOURCES; do
|
||||
if [[ -f "$f" ]]; then
|
||||
fname=$(basename $f)
|
||||
cp $f $TARGET
|
||||
chown ${OWNER}: $TARGET/$fname
|
||||
chmod 0644 $TARGET/$fname
|
||||
fi
|
||||
done
|
||||
@ -1,37 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-dhcp-agent"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
source /opt/kolla/config-sudoers.sh
|
||||
|
||||
# Override set_configs() here because it doesn't work for fat containers like
|
||||
# this one.
|
||||
set_configs() {
|
||||
case $KOLLA_CONFIG_STRATEGY in
|
||||
COPY_ALWAYS)
|
||||
source /opt/kolla/neutron-dhcp-agent/config-external.sh
|
||||
;;
|
||||
COPY_ONCE)
|
||||
if [[ -f /configured-dhcp ]]; then
|
||||
echo 'INFO - Neutron-dhcp has already been configured; Refusing to copy new configs'
|
||||
return
|
||||
fi
|
||||
source /opt/kolla/neutron-dhcp-agent/config-external.sh
|
||||
touch /configured-dhcp
|
||||
;;
|
||||
|
||||
*)
|
||||
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1,23 +0,0 @@
|
||||
#!/bin/bash
|
||||
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/l3_agent.ini /opt/kolla/neutron-agents/fwaas_driver.ini"
|
||||
TARGET="/etc/neutron/"
|
||||
OWNER="neutron"
|
||||
|
||||
for f in $SOURCES; do
|
||||
if [[ -f "$f" ]]; then
|
||||
fname=$(basename $f)
|
||||
cp $f $TARGET
|
||||
chown ${OWNER}: $TARGET/$fname
|
||||
chmod 0644 $TARGET/$fname
|
||||
fi
|
||||
done
|
||||
|
||||
SOURCE="/opt/kolla/neutron-agents/ml2_conf.ini"
|
||||
TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
@ -1,3 +0,0 @@
|
||||
[fwaas]
|
||||
#driver = neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver
|
||||
#enabled = True
|
||||
@ -1,37 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-l3-agent"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
source /opt/kolla/config-sudoers.sh
|
||||
|
||||
# Override set_configs() here because it doesn't work for fat containers like
|
||||
# this one.
|
||||
set_configs() {
|
||||
case $KOLLA_CONFIG_STRATEGY in
|
||||
COPY_ALWAYS)
|
||||
source /opt/kolla/neutron-l3-agent/config-external.sh
|
||||
;;
|
||||
COPY_ONCE)
|
||||
if [[ -f /configured-l3 ]]; then
|
||||
echo 'INFO - Neutron-l3 has already been configured; Refusing to copy new configs'
|
||||
return
|
||||
fi
|
||||
source /opt/kolla/neutron-l3-agent/config-external.sh
|
||||
touch /configured-l3
|
||||
;;
|
||||
|
||||
*)
|
||||
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1,20 +0,0 @@
|
||||
#!/bin/bash
|
||||
SOURCE="/opt/kolla/neutron-linuxbridge-agent/neutron.conf"
|
||||
TARGET="/etc/neutron/neutron.conf"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
|
||||
SOURCE="/opt/kolla/neutron-linuxbridge-agent/ml2_conf.ini"
|
||||
TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
@ -1,14 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-linuxbridge-agent"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
source /opt/kolla/config-sudoers.sh
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1,13 +0,0 @@
|
||||
#!/bin/bash
|
||||
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/metadata_agent.ini"
|
||||
TARGET="/etc/neutron/"
|
||||
OWNER="neutron"
|
||||
|
||||
for f in $SOURCES; do
|
||||
if [[ -f "$f" ]]; then
|
||||
fname=$(basename $f)
|
||||
cp $f $TARGET
|
||||
chown ${OWNER}: $TARGET/$fname
|
||||
chmod 0644 $TARGET/$fname
|
||||
fi
|
||||
done
|
||||
@ -1,37 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-metadata-agent"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
source /opt/kolla/config-sudoers.sh
|
||||
|
||||
# Override set_configs() here because it doesn't work for fat containers like
|
||||
# this one.
|
||||
set_configs() {
|
||||
case $KOLLA_CONFIG_STRATEGY in
|
||||
COPY_ALWAYS)
|
||||
source /opt/kolla/neutron-metadata-agent/config-external.sh
|
||||
;;
|
||||
COPY_ONCE)
|
||||
if [[ -f /configured-md ]]; then
|
||||
echo 'INFO - Neutron-metadata has already been configured; Refusing to copy new configs'
|
||||
return
|
||||
fi
|
||||
source /opt/kolla/neutron-metadata-agent/config-external.sh
|
||||
touch /configured-md
|
||||
;;
|
||||
|
||||
*)
|
||||
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1,20 +0,0 @@
|
||||
#!/bin/bash
|
||||
SOURCE="/opt/kolla/neutron-openvswitch-agent/neutron.conf"
|
||||
TARGET="/etc/neutron/neutron.conf"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
|
||||
SOURCE="/opt/kolla/neutron-openvswitch-agent/ml2_conf.ini"
|
||||
TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
@ -1,14 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-openvswitch-agent"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
source /opt/kolla/config-sudoers.sh
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1,20 +0,0 @@
|
||||
#!/bin/bash
|
||||
SOURCE="/opt/kolla/neutron-server/neutron.conf"
|
||||
TARGET="/etc/neutron/neutron.conf"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
|
||||
SOURCE="/opt/kolla/neutron-server/ml2_conf.ini"
|
||||
TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
@ -1,20 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-server"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
|
||||
# of the KOLLA_BOOTSTRAP variable being set, including empty.
|
||||
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
|
||||
su -s /bin/bash -c "neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head" neutron
|
||||
exit 0
|
||||
fi
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1 +1 @@
|
||||
../../../docker/common/neutron/neutron-l3-agent/fwaas_driver.ini
|
||||
neutron-l3-agent/fwaas_driver.ini
|
||||
@ -1 +0,0 @@
|
||||
../../../../docker/common/neutron/neutron-dhcp-agent/config-external.sh
|
||||
@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/dhcp_agent.ini /opt/kolla/neutron-agents/dnsmasq.conf"
|
||||
TARGET="/etc/neutron/"
|
||||
OWNER="neutron"
|
||||
|
||||
for f in $SOURCES; do
|
||||
if [[ -f "$f" ]]; then
|
||||
fname=$(basename $f)
|
||||
cp $f $TARGET
|
||||
chown ${OWNER}: $TARGET/$fname
|
||||
chmod 0644 $TARGET/$fname
|
||||
fi
|
||||
done
|
||||
@ -1 +0,0 @@
|
||||
../../../../docker/common/neutron/neutron-dhcp-agent/start.sh
|
||||
37
docker_templates/neutron/neutron-agents/neutron-dhcp-agent/start.sh
Executable file
37
docker_templates/neutron/neutron-agents/neutron-dhcp-agent/start.sh
Executable file
@ -0,0 +1,37 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-dhcp-agent"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
source /opt/kolla/config-sudoers.sh
|
||||
|
||||
# Override set_configs() here because it doesn't work for fat containers like
|
||||
# this one.
|
||||
set_configs() {
|
||||
case $KOLLA_CONFIG_STRATEGY in
|
||||
CONFIG_EXTERNAL_COPY_ALWAYS)
|
||||
source /opt/kolla/neutron-dhcp-agent/config-external.sh
|
||||
;;
|
||||
CONFIG_EXTERNAL_COPY_ONCE)
|
||||
if [[ -f /configured-dhcp ]]; then
|
||||
echo 'INFO - Neutron-dhcp has already been configured; Refusing to copy new configs'
|
||||
return
|
||||
fi
|
||||
source /opt/kolla/neutron-dhcp-agent/config-external.sh
|
||||
touch /configured-dhcp
|
||||
;;
|
||||
|
||||
*)
|
||||
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1 +0,0 @@
|
||||
../../../../docker/common/neutron/neutron-l3-agent/config-external.sh
|
||||
23
docker_templates/neutron/neutron-agents/neutron-l3-agent/config-external.sh
Executable file
23
docker_templates/neutron/neutron-agents/neutron-l3-agent/config-external.sh
Executable file
@ -0,0 +1,23 @@
|
||||
#!/bin/bash
|
||||
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/l3_agent.ini /opt/kolla/neutron-agents/fwaas_driver.ini"
|
||||
TARGET="/etc/neutron/"
|
||||
OWNER="neutron"
|
||||
|
||||
for f in $SOURCES; do
|
||||
if [[ -f "$f" ]]; then
|
||||
fname=$(basename $f)
|
||||
cp $f $TARGET
|
||||
chown ${OWNER}: $TARGET/$fname
|
||||
chmod 0644 $TARGET/$fname
|
||||
fi
|
||||
done
|
||||
|
||||
SOURCE="/opt/kolla/neutron-agents/ml2_conf.ini"
|
||||
TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
@ -1 +0,0 @@
|
||||
../../../../docker/common/neutron/neutron-l3-agent/fwaas_driver.ini
|
||||
@ -0,0 +1,3 @@
|
||||
[fwaas]
|
||||
#driver = neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver
|
||||
#enabled = True
|
||||
@ -1 +0,0 @@
|
||||
../../../../docker/common/neutron/neutron-l3-agent/start.sh
|
||||
37
docker_templates/neutron/neutron-agents/neutron-l3-agent/start.sh
Executable file
37
docker_templates/neutron/neutron-agents/neutron-l3-agent/start.sh
Executable file
@ -0,0 +1,37 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-l3-agent"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
source /opt/kolla/config-sudoers.sh
|
||||
|
||||
# Override set_configs() here because it doesn't work for fat containers like
|
||||
# this one.
|
||||
set_configs() {
|
||||
case $KOLLA_CONFIG_STRATEGY in
|
||||
CONFIG_EXTERNAL_COPY_ALWAYS)
|
||||
source /opt/kolla/neutron-l3-agent/config-external.sh
|
||||
;;
|
||||
CONFIG_EXTERNAL_COPY_ONCE)
|
||||
if [[ -f /configured-l3 ]]; then
|
||||
echo 'INFO - Neutron-l3 has already been configured; Refusing to copy new configs'
|
||||
return
|
||||
fi
|
||||
source /opt/kolla/neutron-l3-agent/config-external.sh
|
||||
touch /configured-l3
|
||||
;;
|
||||
|
||||
*)
|
||||
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1 +0,0 @@
|
||||
../../../../docker/common/neutron/neutron-metadata-agent/config-external.sh
|
||||
@ -0,0 +1,13 @@
|
||||
#!/bin/bash
|
||||
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/metadata_agent.ini"
|
||||
TARGET="/etc/neutron/"
|
||||
OWNER="neutron"
|
||||
|
||||
for f in $SOURCES; do
|
||||
if [[ -f "$f" ]]; then
|
||||
fname=$(basename $f)
|
||||
cp $f $TARGET
|
||||
chown ${OWNER}: $TARGET/$fname
|
||||
chmod 0644 $TARGET/$fname
|
||||
fi
|
||||
done
|
||||
@ -1 +0,0 @@
|
||||
../../../../docker/common/neutron/neutron-metadata-agent/start.sh
|
||||
37
docker_templates/neutron/neutron-agents/neutron-metadata-agent/start.sh
Executable file
37
docker_templates/neutron/neutron-agents/neutron-metadata-agent/start.sh
Executable file
@ -0,0 +1,37 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-metadata-agent"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadata_agent.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
source /opt/kolla/config-sudoers.sh
|
||||
|
||||
# Override set_configs() here because it doesn't work for fat containers like
|
||||
# this one.
|
||||
set_configs() {
|
||||
case $KOLLA_CONFIG_STRATEGY in
|
||||
CONFIG_EXTERNAL_COPY_ALWAYS)
|
||||
source /opt/kolla/neutron-metadata-agent/config-external.sh
|
||||
;;
|
||||
CONFIG_EXTERNAL_COPY_ONCE)
|
||||
if [[ -f /configured-md ]]; then
|
||||
echo 'INFO - Neutron-metadata has already been configured; Refusing to copy new configs'
|
||||
return
|
||||
fi
|
||||
source /opt/kolla/neutron-metadata-agent/config-external.sh
|
||||
touch /configured-md
|
||||
;;
|
||||
|
||||
*)
|
||||
echo '$KOLLA_CONFIG_STRATEGY is not set properly'
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1 +0,0 @@
|
||||
../../../docker/common/neutron/neutron-agents/supervisord.conf
|
||||
40
docker_templates/neutron/neutron-agents/supervisord.conf
Normal file
40
docker_templates/neutron/neutron-agents/supervisord.conf
Normal file
@ -0,0 +1,40 @@
|
||||
[unix_http_server]
|
||||
file = /var/run/supervisor.sock
|
||||
|
||||
[inet_http_server]
|
||||
port = 127.0.0.1:9001
|
||||
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
logfile = /var/log/supervisor/supervisord.log
|
||||
logfile_maxbytes = 200KB
|
||||
logfile_backups = 1
|
||||
pidfile = /var/run/supervisord.pid
|
||||
childlogdir = /var/log/supervisor
|
||||
|
||||
[rpcinterface:supervisor]
|
||||
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
|
||||
|
||||
[supervisorctl]
|
||||
serverurl = unix:///var/run/supervisor.sock
|
||||
|
||||
[program:neutron-dhcp-agent]
|
||||
command=/opt/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
|
||||
priority=40
|
||||
startsec=10
|
||||
stderr_events_enabled=true
|
||||
stdout_events_enabled=true
|
||||
|
||||
[program:neutron-l3-agent]
|
||||
command=/opt/kolla/neutron-l3-agent/start.sh
|
||||
priority=40
|
||||
startsec=10
|
||||
stderr_events_enabled=true
|
||||
stdout_events_enabled=true
|
||||
@ -1 +0,0 @@
|
||||
../../../docker/common/neutron/neutron-base/config-sudoers.sh
|
||||
12
docker_templates/neutron/neutron-base/config-sudoers.sh
Normal file
12
docker_templates/neutron/neutron-base/config-sudoers.sh
Normal file
@ -0,0 +1,12 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Neutron uses rootwrap which requires a tty for sudo.
|
||||
# Since the container is running in daemon mode, a tty
|
||||
# is not present and requiretty must be commented out.
|
||||
if [ ! -f /sudo-modified ]; then
|
||||
chmod 0640 /etc/sudoers
|
||||
sed -i '/Defaults requiretty/s/^/#/' /etc/sudoers
|
||||
chmod 0440 /etc/sudoers
|
||||
fi
|
||||
|
||||
touch /sudo-modified
|
||||
@ -1 +0,0 @@
|
||||
../../../docker/common/neutron/neutron-base/ip_wrapper.py
|
||||
66
docker_templates/neutron/neutron-base/ip_wrapper.py
Executable file
66
docker_templates/neutron/neutron-base/ip_wrapper.py
Executable file
@ -0,0 +1,66 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
# Copyright 2015 Sam Yaple
|
||||
#
|
||||
# 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 file exists because we want to create and delete any network
|
||||
# namespaces from the host mount namespace. This allows the host to
|
||||
# access all of the neutron network namespaces as well as all
|
||||
# containers that bind mount /run/netns from the host.
|
||||
|
||||
# This is required for "thin" neutron containers to function properly
|
||||
|
||||
import nsenter
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
|
||||
def host_mnt_exec(cmd):
|
||||
try:
|
||||
with nsenter.ExitStack() as stack:
|
||||
stack.enter_context(
|
||||
nsenter.Namespace(
|
||||
'1',
|
||||
'mnt',
|
||||
proc='/opt/kolla/host_proc/'))
|
||||
process_ = subprocess.Popen(cmd)
|
||||
|
||||
except Exception as e:
|
||||
print(
|
||||
"An error has occured with a component that Kolla manages."
|
||||
" Please file a bug")
|
||||
print("Error: ", e)
|
||||
|
||||
return process_
|
||||
|
||||
|
||||
if len(sys.argv) > 2:
|
||||
# We catch all commands that ip will accept that refer
|
||||
# to creating or deleteing a Network namespace
|
||||
if str(sys.argv[1]).startswith("net") and (
|
||||
str(sys.argv[2]).startswith("a") or
|
||||
str(sys.argv[2]).startswith("d")):
|
||||
# This cmd is executed in the host mount namespace
|
||||
cmd = ["/usr/bin/env", "ip"] + sys.argv[1:]
|
||||
sys.exit(host_mnt_exec(cmd).returncode)
|
||||
else:
|
||||
cmd = ["/opt/kolla/ip"] + sys.argv[1:]
|
||||
else:
|
||||
cmd = ["/opt/kolla/ip"]
|
||||
|
||||
if len(sys.argv) == 2:
|
||||
cmd = cmd + sys.argv[1:]
|
||||
|
||||
process_ = subprocess.Popen(cmd)
|
||||
sys.exit(process_.returncode)
|
||||
@ -1 +0,0 @@
|
||||
../../../docker/common/neutron/neutron-linuxbridge-agent/config-external.sh
|
||||
20
docker_templates/neutron/neutron-linuxbridge-agent/config-external.sh
Executable file
20
docker_templates/neutron/neutron-linuxbridge-agent/config-external.sh
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
SOURCE="/opt/kolla/neutron-linuxbridge-agent/neutron.conf"
|
||||
TARGET="/etc/neutron/neutron.conf"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
|
||||
SOURCE="/opt/kolla/neutron-linuxbridge-agent/ml2_conf.ini"
|
||||
TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
@ -1 +0,0 @@
|
||||
../../../docker/common/neutron/neutron-linuxbridge-agent/start.sh
|
||||
14
docker_templates/neutron/neutron-linuxbridge-agent/start.sh
Executable file
14
docker_templates/neutron/neutron-linuxbridge-agent/start.sh
Executable file
@ -0,0 +1,14 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-linuxbridge-agent"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
source /opt/kolla/config-sudoers.sh
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1 +0,0 @@
|
||||
../../../docker/common/neutron/neutron-openvswitch-agent/config-external.sh
|
||||
20
docker_templates/neutron/neutron-openvswitch-agent/config-external.sh
Executable file
20
docker_templates/neutron/neutron-openvswitch-agent/config-external.sh
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
SOURCE="/opt/kolla/neutron-openvswitch-agent/neutron.conf"
|
||||
TARGET="/etc/neutron/neutron.conf"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
|
||||
SOURCE="/opt/kolla/neutron-openvswitch-agent/ml2_conf.ini"
|
||||
TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
@ -1 +0,0 @@
|
||||
../../../docker/common/neutron/neutron-openvswitch-agent/start.sh
|
||||
14
docker_templates/neutron/neutron-openvswitch-agent/start.sh
Executable file
14
docker_templates/neutron/neutron-openvswitch-agent/start.sh
Executable file
@ -0,0 +1,14 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-openvswitch-agent"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
source /opt/kolla/config-sudoers.sh
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
exec $CMD $ARGS
|
||||
@ -1 +0,0 @@
|
||||
../../../docker/common/neutron/neutron-server/config-external.sh
|
||||
20
docker_templates/neutron/neutron-server/config-external.sh
Executable file
20
docker_templates/neutron/neutron-server/config-external.sh
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
SOURCE="/opt/kolla/neutron-server/neutron.conf"
|
||||
TARGET="/etc/neutron/neutron.conf"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
|
||||
SOURCE="/opt/kolla/neutron-server/ml2_conf.ini"
|
||||
TARGET="/etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
OWNER="neutron"
|
||||
|
||||
if [[ -f "$SOURCE" ]]; then
|
||||
cp $SOURCE $TARGET
|
||||
chown ${OWNER}: $TARGET
|
||||
chmod 0644 $TARGET
|
||||
fi
|
||||
@ -1 +0,0 @@
|
||||
../../../docker/common/neutron/neutron-server/start.sh
|
||||
20
docker_templates/neutron/neutron-server/start.sh
Executable file
20
docker_templates/neutron/neutron-server/start.sh
Executable file
@ -0,0 +1,20 @@
|
||||
#!/bin/bash
|
||||
set -o errexit
|
||||
|
||||
CMD="/usr/bin/neutron-server"
|
||||
ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini"
|
||||
|
||||
# Loading common functions.
|
||||
source /opt/kolla/kolla-common.sh
|
||||
|
||||
# Execute config strategy
|
||||
set_configs
|
||||
|
||||
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
|
||||
# of the KOLLA_BOOTSTRAP variable being set, including empty.
|
||||
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
|
||||
su -s /bin/bash -c "neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head" neutron
|
||||
exit 0
|
||||
fi
|
||||
|
||||
exec $CMD $ARGS
|
||||
Loading…
x
Reference in New Issue
Block a user