Fixes for fuel-bootstrap-cli

Change-Id: I5b0085b257e4c71c9d5078037064b20ad76f06fa

contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/consts.py

@@ -18,7 +18,7 @@
 # These consts shouldn't be configured
 
 # TODO(asvechnikov): add possibility to specify custom config file
-CONFIG_FILE = "/etc/fuel-agent/fuel_bootstrap_cli.yaml"
+CONFIG_FILE = "/etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml"
 METADATA_FILE = "metadata.yaml"
 CONTAINER_FORMAT = "tar.gz"
 ROOTFS = {'name': 'rootfs',

contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample

@@ -10,7 +10,7 @@ extend_kopts: "biosdevname=0 debug ignore_loglevel log_buf_len=10M print_fatal_s
 # generating system initramfs - thus it's possible to
 # adjust initramfs
 extra_files:
-  - /usr/share/fuel_bootstrap/files/trusty
+  - /usr/share/fuel_bootstrap_cli/files/trusty
 # Save generated bootstrap container to
 output_dir: /tmp/
 # Defines kernel version
@@ -47,21 +47,21 @@ packages:
 ubuntu_repos:
   -
     name: ubuntu
-    priority: None
+    priority: null
     section: "main universe multiverse"
     suite: trusty
     type: deb
     uri: "http://archive.ubuntu.com/ubuntu"
   -
     name: ubuntu-updates
-    priority: None
+    priority: null
     section: "main universe multiverse"
     suite: trusty-updates
     type: deb
     uri: "http://archive.ubuntu.com/ubuntu"
   -
     name: ubuntu-security
-    priority: None
+    priority: null
     section: "main universe multiverse"
     suite: trusty-security
     type: deb
@@ -100,7 +100,7 @@ mos_repos:
 extra_repos:
   -
     name: Extra_repo
-    priority: None
+    priority: null
     section: main
     suite: trusty
     type: deb

contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/bootstrap_image.py

@@ -138,4 +138,4 @@ def make_bootstrap(params):
                       '--image_build_dir', params.image_build_dir,
                       '--input_data_file', f.name)
 
-    return bootdata['uuid'], bootdata['output']
+    return bootdata['bootstrap']['uuid'], bootdata['output']

contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/utils/data.py

@@ -135,10 +135,10 @@ class BootstrapDataBuilder(object):
                 repo,
                 name="extra_repo{0}".format(repo_count)))
 
-        if not self.extra_repos:
+        if not self.extra_repos and CONF.extra_repos:
             repos.extend(CONF.extra_repos)
 
-        return sorted(repos, key=lambda repo: repo['priority'] or 500)
+        return repos
 
     def _get_packages(self):
         result = set(CONF.packages)
@@ -147,6 +147,17 @@ class BootstrapDataBuilder(object):
             result |= set(self.packages)
         return list(result)
 
+    def _parse_ubuntu_repos(self, repo):
+        uri, suite = self._parse_not_extra_repo(repo)
+
+        return self._generate_repos_from_uri(
+            uri=uri,
+            codename=self.ubuntu_release,
+            name='ubuntu',
+            components=['', '-updates', '-security'],
+            section='main universe multiverse'
+        )
+
     @classmethod
     def _parse_not_extra_repo(cls, repo):
         regexp = r"(?P<uri>[^\s]+) (?P<suite>[^\s]+)"
@@ -183,18 +194,6 @@ class BootstrapDataBuilder(object):
         )
         return result
 
-    @classmethod
-    def _parse_ubuntu_repos(cls, repo):
-        uri, suite = cls._parse_not_extra_repo(repo)
-
-        return cls._generate_repos_from_uri(
-            uri=uri,
-            codename=cls.ubuntu_release,
-            name='ubuntu',
-            components=['', '-updates', '-security'],
-            section='main universe multiverse'
-        )
-
     @classmethod
     def _generate_repos_from_uri(cls, uri, codename, name, components=None,
                                  section=None, type_=None, priority=None):