openstack/kolla-ansible
Code Issues Proposed changes

Merge "sudoers script was not properly running"

Browse Source
This commit is contained in:
Jenkins 2015-07-23 13:15:47 +00:00 committed by Gerrit Code Review
commit 266ffe2d40
11 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/common/neutron/neutron-base/config-sudoers.sh
View File

@ -3,10 +3,10 @@
# 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 /var/run/sudo-modified ]; then
if [ ! -f /sudo-modified ]; then
chmod 0640 /etc/sudoers
sed -i '/Defaults requiretty/s/^/#/' /etc/sudoers
chmod 0440 /etc/sudoers
fi
touch /var/run/sudo-modified
touch /sudo-modified

1
docker/common/neutron/neutron-dhcp-agent/config-internal.sh
View File

@ -3,7 +3,6 @@
set -e
. /opt/kolla/config-neutron.sh
. /opt/kolla/config-sudoers.sh
: ${DHCP_DRIVER:=neutron.agent.linux.dhcp.Dnsmasq}
: ${USE_NAMESPACES:=true}

1
docker/common/neutron/neutron-dhcp-agent/start.sh
View File

@ -6,6 +6,7 @@ ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_ag
# 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.

1
docker/common/neutron/neutron-l3-agent/config-internal.sh
View File

@ -3,7 +3,6 @@
set -e
. /opt/kolla/config-neutron.sh
. /opt/kolla/config-sudoers.sh
: ${USE_NAMESPACES:=true}

1
docker/common/neutron/neutron-l3-agent/start.sh
View File

@ -6,6 +6,7 @@ ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agen
# 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.

1
docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh
View File

@ -3,7 +3,6 @@
set -e
. /opt/kolla/config-neutron.sh
. /opt/kolla/config-sudoers.sh
: ${NEUTRON_FLAT_NETWORK_NAME:=physnet1}
: ${NEUTRON_FLAT_NETWORK_INTERFACE:=eth1}

1
docker/common/neutron/neutron-linuxbridge-agent/start.sh
View File

@ -6,6 +6,7 @@ ARGS="--config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-dir /etc/neut
# Loading common functions.
source /opt/kolla/kolla-common.sh
source /opt/kolla/config-sudoers.sh
# Config-internal script exec out of this function, it does not return here.
set_configs

1
docker/common/neutron/neutron-metadata-agent/config-internal.sh
View File

@ -3,7 +3,6 @@
set -e
. /opt/kolla/config-neutron.sh
. /opt/kolla/config-sudoers.sh
: ${KEYSTONE_REGION:=RegionOne}
: ${ENDPOINT_TYPE:=adminURL}

1
docker/common/neutron/neutron-metadata-agent/start.sh
View File

@ -6,6 +6,7 @@ ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/metadat
# 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.

1
docker/common/neutron/neutron-openvswitch-agent/config-internal.sh
View File

@ -3,7 +3,6 @@
set -e
. /opt/kolla/config-neutron.sh
. /opt/kolla/config-sudoers.sh
: ${NEUTRON_FLAT_NETWORK_NAME:=physnet1}
: ${NEUTRON_FLAT_NETWORK_INTERFACE:=eth1}

1
docker/common/neutron/neutron-openvswitch-agent/start.sh
View File

@ -6,6 +6,7 @@ ARGS="--config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins
# Loading common functions.
source /opt/kolla/kolla-common.sh
source /opt/kolla/config-sudoers.sh
# Config-internal script exec out of this function, it does not return here.
set_configs