From 82091e0d61f252619a0842d0f8debb6b602a61fe Mon Sep 17 00:00:00 2001 From: Evgeniy L Date: Tue, 9 Sep 2014 15:31:41 +0400 Subject: [PATCH] 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 --- .../fuel_upgrade/fuel_upgrade/engines/docker_engine.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fuel_upgrade_system/fuel_upgrade/fuel_upgrade/engines/docker_engine.py b/fuel_upgrade_system/fuel_upgrade/fuel_upgrade/engines/docker_engine.py index 1cf6a905f1..fba715fc28 100644 --- a/fuel_upgrade_system/fuel_upgrade/fuel_upgrade/engines/docker_engine.py +++ b/fuel_upgrade_system/fuel_upgrade/fuel_upgrade/engines/docker_engine.py @@ -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