From 96a76332a46257ce6af777756c7e5439345327eb Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 20 Jul 2018 10:34:39 -0400 Subject: Fixes for snapshots With deploying snapshots with a new ODL, we currently bring down the docker container and bring up the tar.gz distro of ODL on the Overcloud host itself (not rebuilding/using container). Therefore we need java installed so that ODL can run on the host. In the future this may change, but it works well and keeps things simple for now. Additionally, there was a change upstream to make the opendaylight container docker restart policy "unless-stopped" which means it will no longer restart automatically when docker is stopped/started. Therefore on first snapshot bring up (without the previously mentioned ODL reinstallation) the container does not start, and snapshot deployment fails. This patch includes a change to the restart policy to always restart it. Change-Id: Icc712ba147e578a28e371313154ae3190676f0dc Signed-off-by: Tim Rozet --- apex/tests/test_apex_overcloud_builder.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apex/tests') diff --git a/apex/tests/test_apex_overcloud_builder.py b/apex/tests/test_apex_overcloud_builder.py index 46b5f871..8bed3d70 100644 --- a/apex/tests/test_apex_overcloud_builder.py +++ b/apex/tests/test_apex_overcloud_builder.py @@ -43,6 +43,7 @@ class TestOvercloudBuilder(unittest.TestCase): {con.VIRT_RUN_CMD: 'rm -rf /etc/puppet/modules/opendaylight'}, {con.VIRT_RUN_CMD: "cd /etc/puppet/modules/ && tar xvf " "puppet-opendaylight.tar"}, + {con.VIRT_INSTALL: "java-1.8.0-openjdk"}, {con.VIRT_INSTALL: 'opendaylight'} ] oc_builder.inject_opendaylight(con.DEFAULT_ODL_VERSION, 'dummy.qcow2', @@ -65,6 +66,7 @@ class TestOvercloudBuilder(unittest.TestCase): {con.VIRT_RUN_CMD: 'rm -rf /etc/puppet/modules/opendaylight'}, {con.VIRT_RUN_CMD: "cd /etc/puppet/modules/ && tar xvf " "puppet-opendaylight.tar"}, + {con.VIRT_INSTALL: "java-1.8.0-openjdk"}, ] oc_builder.inject_opendaylight('oxygen', 'dummy.qcow2', '/dummytmp/', uc_ip='192.0.2.2', -- cgit 1.2.3-korg