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 <trozet@redhat.com>

diff --git a/apex/builders/overcloud_builder.py b/apex/builders/overcloud_builder.py
index d2a3100..d6f03eb 100644 (file)
--- a/apex/builders/overcloud_builder.py
+++ b/apex/builders/overcloud_builder.py
@@ -42,7 +42,8 @@ def inject_opendaylight(odl_version, image, tmp_dir, uc_ip,
         {con.VIRT_UPLOAD: "{}:/etc/puppet/modules/".format(archive)},
         {con.VIRT_RUN_CMD: 'rm -rf /etc/puppet/modules/opendaylight'},
         {con.VIRT_RUN_CMD: "cd /etc/puppet/modules/ && tar xvf "
-                           "puppet-opendaylight.tar"}
+                           "puppet-opendaylight.tar"},
+        {con.VIRT_INSTALL: "java-1.8.0-openjdk"}
     ]
     if docker_tag:
         docker_cmds = [

diff --git a/apex/tests/test_apex_overcloud_builder.py b/apex/tests/test_apex_overcloud_builder.py
index 46b5f87..8bed3d7 100644 (file)
--- 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',

diff --git a/lib/ansible/playbooks/post_deploy_overcloud.yml b/lib/ansible/playbooks/post_deploy_overcloud.yml
index af743b2..212d2cf 100644 (file)
--- a/lib/ansible/playbooks/post_deploy_overcloud.yml
+++ b/lib/ansible/playbooks/post_deploy_overcloud.yml
@@ -69,3 +69,9 @@
       when:
         - "'compute' in ansible_hostname"
         - os_version == 'pike'
+    - name: Update ODL container restart policy to always
+      shell: "docker update --restart=always opendaylight_api"
+      become: yes
+      when:
+        - sdn == 'opendaylight'
+        - "'controller' in ansible_hostname"