Upgrades, copy cobbler files right after container is created

Supervisor start is too slow, puppet run (and cobbler sync)
passes before we copy the data for cobbler.

The solution is to copy all required files right
after container is created.

Change-Id: I6b4b0ab879d31e43a70e5c9e72c83b1de47ddfb2
Related-bug: #1366875
This commit is contained in:
Evgeniy L 2014-09-09 15:31:41 +04:00
parent d97c8f5e4c
commit 82091e0d61

View File

@ -334,14 +334,14 @@ class DockerUpgrader(UpgradeEngine):
binds=container.get('binds'),
privileged=container.get('privileged', False))
if container.get('after_container_creation_command'):
self.run_after_container_creation_command(container)
if container.get('supervisor_config'):
self.start_service_under_supervisor(
self.make_service_name(container['id']))
self.clean_iptables_rules(container)
if container.get('after_container_creation_command'):
self.run_after_container_creation_command(container)
def run_after_container_creation_command(self, container):
"""Runs command in container with retries in
case of error