Merge "Make sure fuel_agent builds IBP images in a proper directory"

fuel_upgrade_system/fuel_upgrade/fuel_upgrade/config.py

@@ -334,6 +334,10 @@ def config(update_path, admin_password):
             ('/var/lib/fuel/keys', {'bind': '/var/lib/fuel/keys',
                                     'ro': False})],
 
+        'volume_fuel_ibp': [
+            ('/var/lib/fuel/ibp', {'bind': '/var/lib/fuel/ipb',
+                                   'ro': False})],
+
         'volume_postgres_data': [
             ('{0}/postgres'.format(container_data_path), {
                 'bind': '/var/lib/pgsql',
@@ -429,6 +433,7 @@ def config(update_path, admin_password):
              'volume_ssh_keys',
              'volume_dump',
              'volume_fuel_configs',
+             'volume_fuel_ibp',
              'volume_keys']},
 
         {'id': 'rsync',

nailgun/nailgun/orchestrator/tasks_templates.py

@@ -200,6 +200,7 @@ def make_provisioning_images_task(uids, repos, provision_data, cid):
     return make_shell_task(uids, {
         'parameters': {
             'cmd': ("fa_build_image "
+                    "--image_build_dir /var/lib/fuel/ibp "
                     "--log-file /var/log/fuel-agent-env-{0}.log "
                     "--data_driver nailgun_build_image "
                     "--input_data '{1}'").format(cid, conf),

nailgun/nailgun/test/unit/test_tasks_templates.py

@@ -164,7 +164,8 @@ class TestMakeTask(base.BaseTestCase):
             }
         )
         cmd = result["parameters"]["cmd"].lstrip(
-            "fa_build_image --log-file /var/log/fuel-agent-env-123.log "
+            "fa_build_image --image_build_dir /var/lib/fuel/ibp "
+            "--log-file /var/log/fuel-agent-env-123.log "
             "--data_driver nailgun_build_image --input_data '").rstrip("'")
         self.assertEqual(jsonutils.loads(cmd), fuel_image_conf)