diff options
| author | Sam Yaple <sam@yaple.net> | 2015-10-13 06:30:30 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-10-13 15:13:55 +0000 |
| commit | 5f200e044648efe64f297d186432839762f91395 (patch) | |
| tree | 94500884a880720dea35946dbbc2370a98b7b073 | |
| parent | c5be228be843222e9c9f2be36b92659ada3e25a8 (diff) | |
| download | kolla-5f200e044648efe64f297d186432839762f91395.tar.gz kolla-5f200e044648efe64f297d186432839762f91395.zip | |
Fix issue with su and bad kernels
Long story short, some kernels before 3.15 had an issue with using su
in a container when the network namespace was --net=host. The gate
has a 3.10 and a 3.13 kernel and has a problem with this. This changes
everything to use sudo
backport: liberty
Partially-Implements: blueprint functional-testing-gate
Change-Id: I4d79ccaa1cddffcc8393f64e7e1be2538efe33e5
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq.json.j2 | 2 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/cinder/cinder-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/designate/designate-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/glance/glance-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/gnocchi/gnocchi-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/heat/heat-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/keystone/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/magnum/magnum-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/murano/murano-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/nova/nova-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/zaqar/extend_start.sh | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 b/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 index 1f0d48a67..264c96fde 100644 --- a/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 +++ b/ansible/roles/rabbitmq/templates/rabbitmq.json.j2 @@ -1,5 +1,5 @@ { - "command": "/usr/sbin/rabbitmq-server", + "command": "sudo -H -u rabbitmq /usr/sbin/rabbitmq-server", "config_files": [ { "source": "{{ container_config_directory }}/rabbitmq-env.conf", diff --git a/docker/ceilometer/ceilometer-api/extend_start.sh b/docker/ceilometer/ceilometer-api/extend_start.sh index afe612ae6..5e38e555d 100644 --- a/docker/ceilometer/ceilometer-api/extend_start.sh +++ b/docker/ceilometer/ceilometer-api/extend_start.sh @@ -3,6 +3,6 @@ # 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/sh -c "ceilometer-manage db_sync" ceilometer + sudo -H -u ceilometer ceilometer-manage db_sync exit 0 fi diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh index 9cf68ae86..e9a38ac0f 100644 --- a/docker/cinder/cinder-api/extend_start.sh +++ b/docker/cinder/cinder-api/extend_start.sh @@ -4,6 +4,6 @@ set -o errexit # 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/sh -c "cinder-manage db sync" cinder + sudo -H -u cinder cinder-manage db sync exit 0 fi diff --git a/docker/designate/designate-api/extend_start.sh b/docker/designate/designate-api/extend_start.sh index 8fda9197b..f851d894a 100644 --- a/docker/designate/designate-api/extend_start.sh +++ b/docker/designate/designate-api/extend_start.sh @@ -3,6 +3,6 @@ # 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/sh -c "designate-manage db_sync" designate + sudo -H -u designate designate-manage db_sync exit 0 fi diff --git a/docker/glance/glance-api/extend_start.sh b/docker/glance/glance-api/extend_start.sh index eebee43e4..fd70962eb 100644 --- a/docker/glance/glance-api/extend_start.sh +++ b/docker/glance/glance-api/extend_start.sh @@ -3,6 +3,6 @@ # 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/sh -c "glance-manage db_sync" glance + sudo -H -u glance glance-manage db_sync exit 0 fi diff --git a/docker/gnocchi/gnocchi-api/extend_start.sh b/docker/gnocchi/gnocchi-api/extend_start.sh index 8ca5d7388..344c3063f 100644 --- a/docker/gnocchi/gnocchi-api/extend_start.sh +++ b/docker/gnocchi/gnocchi-api/extend_start.sh @@ -3,6 +3,6 @@ # 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/sh -c "gnocchi-manage db_sync" gnocchi + sudo -H -u gnocchi gnocchi-manage db_sync exit 0 fi diff --git a/docker/heat/heat-api/extend_start.sh b/docker/heat/heat-api/extend_start.sh index 17bd742e3..f04438a78 100644 --- a/docker/heat/heat-api/extend_start.sh +++ b/docker/heat/heat-api/extend_start.sh @@ -3,7 +3,7 @@ # 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/sh -c "heat-manage db_sync" heat + sudo -H -u heat heat-manage db_sync openstack domain create heat_user_domain openstack user create --domain heat_user_domain heat_domain_admin --password ${HEAT_DOMAIN_ADMIN_PASSWORD} openstack role add --domain heat_user_domain --user heat_domain_admin admin diff --git a/docker/ironic/ironic-api/extend_start.sh b/docker/ironic/ironic-api/extend_start.sh index bbbe5c7e1..b7ef2b242 100644 --- a/docker/ironic/ironic-api/extend_start.sh +++ b/docker/ironic/ironic-api/extend_start.sh @@ -3,6 +3,6 @@ # 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/sh -c "ironic-dbsync upgrade" ironic + sudo -H -u ironic ironic-dbsync upgrade exit 0 fi diff --git a/docker/keystone/extend_start.sh b/docker/keystone/extend_start.sh index 9bd9d5370..b1a6d334b 100644 --- a/docker/keystone/extend_start.sh +++ b/docker/keystone/extend_start.sh @@ -9,7 +9,7 @@ fi # 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/sh -c "keystone-manage db_sync" keystone + sudo -H -u keystone keystone-manage db_sync # Start the api to set initial endpoint and users with the admin_token $CMD sleep 5 diff --git a/docker/magnum/magnum-api/extend_start.sh b/docker/magnum/magnum-api/extend_start.sh index fae394185..c193a0a9a 100644 --- a/docker/magnum/magnum-api/extend_start.sh +++ b/docker/magnum/magnum-api/extend_start.sh @@ -3,6 +3,6 @@ # 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/sh -c "magnum-manage db_sync" magnum + sudo -H -u magnum magnum-manage db_sync exit 0 fi diff --git a/docker/murano/murano-api/extend_start.sh b/docker/murano/murano-api/extend_start.sh index 578cc72cb..4ca50b6c9 100644 --- a/docker/murano/murano-api/extend_start.sh +++ b/docker/murano/murano-api/extend_start.sh @@ -3,6 +3,6 @@ # 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/sh -c "murano-db-manage --config-file /etc/murano/murano.conf upgrade" murano + sudo -H -u murano murano-db-manage --config-file /etc/murano/murano.conf upgrade exit 0 fi diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index c832d586d..d60829f10 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -3,7 +3,7 @@ # 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 + sudo -H -u neutron neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head exit 0 fi diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh index 2aaad1e8b..9b0e9d746 100644 --- a/docker/nova/nova-api/extend_start.sh +++ b/docker/nova/nova-api/extend_start.sh @@ -3,6 +3,6 @@ # 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/sh -c "nova-manage db sync" nova + sudo -H -u nova nova-manage db sync exit 0 fi diff --git a/docker/zaqar/extend_start.sh b/docker/zaqar/extend_start.sh index d71b02aab..ec128144a 100644 --- a/docker/zaqar/extend_start.sh +++ b/docker/zaqar/extend_start.sh @@ -3,6 +3,6 @@ # 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/sh -c "zaqar-manage db_sync" cinder + sudo -H -u zaqar zaqar-manage db_sync exit 0 fi |
