Merge "sudoers script was not properly running"

11 files changed, 7 insertions, 7 deletions

diff --git a/docker/common/neutron/neutron-base/config-sudoers.sh b/docker/common/neutron/neutron-base/config-sudoers.sh
index 0e02226db..82cf0d624 100644
--- a/docker/common/neutron/neutron-base/config-sudoers.sh
+++ b/docker/common/neutron/neutron-base/config-sudoers.sh
@@ -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
diff --git a/docker/common/neutron/neutron-dhcp-agent/config-internal.sh b/docker/common/neutron/neutron-dhcp-agent/config-internal.sh
index 37182ebca..aa7a47085 100755
--- a/docker/common/neutron/neutron-dhcp-agent/config-internal.sh
+++ b/docker/common/neutron/neutron-dhcp-agent/config-internal.sh
@@ -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}
diff --git a/docker/common/neutron/neutron-dhcp-agent/start.sh b/docker/common/neutron/neutron-dhcp-agent/start.sh
index 71ec4678a..725b52352 100755
--- a/docker/common/neutron/neutron-dhcp-agent/start.sh
+++ b/docker/common/neutron/neutron-dhcp-agent/start.sh
@@ -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.
diff --git a/docker/common/neutron/neutron-l3-agent/config-internal.sh b/docker/common/neutron/neutron-l3-agent/config-internal.sh
index c4fb85205..94d7af0a6 100755
--- a/docker/common/neutron/neutron-l3-agent/config-internal.sh
+++ b/docker/common/neutron/neutron-l3-agent/config-internal.sh
@@ -3,7 +3,6 @@
 set -e
 
 . /opt/kolla/config-neutron.sh
-. /opt/kolla/config-sudoers.sh
 
 : ${USE_NAMESPACES:=true}
 
diff --git a/docker/common/neutron/neutron-l3-agent/start.sh b/docker/common/neutron/neutron-l3-agent/start.sh
index fd85c22b1..f18116107 100755
--- a/docker/common/neutron/neutron-l3-agent/start.sh
+++ b/docker/common/neutron/neutron-l3-agent/start.sh
@@ -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.
diff --git a/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh b/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh
index bd8f90194..343caf298 100755
--- a/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh
+++ b/docker/common/neutron/neutron-linuxbridge-agent/config-internal.sh
@@ -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}
diff --git a/docker/common/neutron/neutron-linuxbridge-agent/start.sh b/docker/common/neutron/neutron-linuxbridge-agent/start.sh
index a8b4879f0..c16b97974 100755
--- a/docker/common/neutron/neutron-linuxbridge-agent/start.sh
+++ b/docker/common/neutron/neutron-linuxbridge-agent/start.sh
@@ -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
diff --git a/docker/common/neutron/neutron-metadata-agent/config-internal.sh b/docker/common/neutron/neutron-metadata-agent/config-internal.sh
index d1eef341c..0c2aecd02 100755
--- a/docker/common/neutron/neutron-metadata-agent/config-internal.sh
+++ b/docker/common/neutron/neutron-metadata-agent/config-internal.sh
@@ -3,7 +3,6 @@
 set -e
 
 . /opt/kolla/config-neutron.sh
-. /opt/kolla/config-sudoers.sh
 
 : ${KEYSTONE_REGION:=RegionOne}
 : ${ENDPOINT_TYPE:=adminURL}
diff --git a/docker/common/neutron/neutron-metadata-agent/start.sh b/docker/common/neutron/neutron-metadata-agent/start.sh
index e67946117..ab4f4a590 100755
--- a/docker/common/neutron/neutron-metadata-agent/start.sh
+++ b/docker/common/neutron/neutron-metadata-agent/start.sh
@@ -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.
diff --git a/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh b/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh
index 8c4d1a037..de22c4adb 100755
--- a/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh
+++ b/docker/common/neutron/neutron-openvswitch-agent/config-internal.sh
@@ -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}
diff --git a/docker/common/neutron/neutron-openvswitch-agent/start.sh b/docker/common/neutron/neutron-openvswitch-agent/start.sh
index 4c05db9c5..0c404eafc 100755
--- a/docker/common/neutron/neutron-openvswitch-agent/start.sh
+++ b/docker/common/neutron/neutron-openvswitch-agent/start.sh
@@ -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