summaryrefslogtreecommitdiffstats
path: root/xci/nfvi/osa
diff options
context:
space:
mode:
authorTapio Tallgren <tapio.tallgren@nokia.com>2017-12-21 20:36:50 +0200
committerTapio Tallgren <tapio.tallgren@nokia.com>2017-12-21 20:40:10 +0200
commit69518147ffb4529c834a9d889b3dba46c0323cde (patch)
treed92aea1abbecad2f5247b94a980a2b3f09901b18 /xci/nfvi/osa
parent1a68730ab76b3fad4395f1cca0d3590c0507d378 (diff)
Bump sha on openstack-ansible-lxc_hosts
The commit 6b529de0315fe6cd12f6e78c00a5f2f2d3a01e28 in openstack-ansible-lxc_hosts reverts an earlier change that introduced systemd-networkd to lxc containers that run OpenStack services. This prevents the containers from being stopped (ie, lxc-stop fails until it times out), since systemd-networkd restarts. lxc-stop sends the SIGRT+3 message to the container which the container interprets as "halt". systemd-networkd conflicts with shutdown, so when the system tries to enter halt, systemd-networkd gets started again. As a result, the container does not shut down cleanly. This patch uses a version of openstack-ansible-lxc_hosts that does not use systemd-networkd in the containers. Change-Id: Ie85d2117ce2e6e8afa87810d690eab78e3b3be3d Signed-off-by: Tapio Tallgren <tapio.tallgren@nokia.com>
Diffstat (limited to 'xci/nfvi/osa')
-rw-r--r--xci/nfvi/osa/files/ansible-role-requirements.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/xci/nfvi/osa/files/ansible-role-requirements.yml b/xci/nfvi/osa/files/ansible-role-requirements.yml
index 90e40d5f..329d24a0 100644
--- a/xci/nfvi/osa/files/ansible-role-requirements.yml
+++ b/xci/nfvi/osa/files/ansible-role-requirements.yml
@@ -48,7 +48,7 @@
- name: lxc_hosts
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
- version: 84ac3442e542aeedf1396c88e0387b4ea1548eb1
+ version: 6b529de0315fe6cd12f6e78c00a5f2f2d3a01e28
- name: memcached_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server