Switch to Ubuntu Xenial
Also introduce 'codename' template arg. blueprint: mos-xenial Change-Id: Id48e5af4adf691293e4291d3e1e422977295fcff
This commit is contained in:
parent
e7f0250488
commit
69479fe6ec
|
@ -57,17 +57,23 @@ class FuelSetup(object):
|
||||||
# Tasks to be executed on Apply
|
# Tasks to be executed on Apply
|
||||||
self.apply_tasks = set()
|
self.apply_tasks = set()
|
||||||
self.version = utils.get_fuel_version()
|
self.version = utils.get_fuel_version()
|
||||||
|
self.codename = 'xenial'
|
||||||
|
|
||||||
# settings load
|
# settings load
|
||||||
self.settings = settings_module.Settings()
|
self.settings = settings_module.Settings()
|
||||||
|
|
||||||
|
template_kwargs = {
|
||||||
|
"mos_version": self.version,
|
||||||
|
"codename": self.codename,
|
||||||
|
}
|
||||||
|
|
||||||
self.settings.load(
|
self.settings.load(
|
||||||
os.path.join(os.path.dirname(__file__), "settings.yaml"),
|
os.path.join(os.path.dirname(__file__), "settings.yaml"),
|
||||||
template_kwargs={"mos_version": self.version})
|
template_kwargs=template_kwargs)
|
||||||
|
|
||||||
self.settings.load(
|
self.settings.load(
|
||||||
consts.SETTINGS_FILE,
|
consts.SETTINGS_FILE,
|
||||||
template_kwargs={"mos_version": self.version})
|
template_kwargs=template_kwargs)
|
||||||
|
|
||||||
self.main()
|
self.main()
|
||||||
self.choices = []
|
self.choices = []
|
||||||
|
|
|
@ -17,19 +17,19 @@ BOOTSTRAP:
|
||||||
section: "main universe multiverse"
|
section: "main universe multiverse"
|
||||||
uri: "http://archive.ubuntu.com/ubuntu"
|
uri: "http://archive.ubuntu.com/ubuntu"
|
||||||
priority: null
|
priority: null
|
||||||
suite: "trusty"
|
suite: "${codename}"
|
||||||
type: "deb"
|
type: "deb"
|
||||||
- name: "ubuntu-updates"
|
- name: "ubuntu-updates"
|
||||||
section: "main universe multiverse"
|
section: "main universe multiverse"
|
||||||
uri: "http://archive.ubuntu.com/ubuntu"
|
uri: "http://archive.ubuntu.com/ubuntu"
|
||||||
priority: null
|
priority: null
|
||||||
suite: "trusty-updates"
|
suite: "${codename}-updates"
|
||||||
type: "deb"
|
type: "deb"
|
||||||
- name: "ubuntu-security"
|
- name: "ubuntu-security"
|
||||||
section: "main universe multiverse"
|
section: "main universe multiverse"
|
||||||
uri: "http://archive.ubuntu.com/ubuntu"
|
uri: "http://archive.ubuntu.com/ubuntu"
|
||||||
priority: null
|
priority: null
|
||||||
suite: "trusty-security"
|
suite: "${codename}-security"
|
||||||
type: "deb"
|
type: "deb"
|
||||||
- name: "mos"
|
- name: "mos"
|
||||||
section: "main restricted"
|
section: "main restricted"
|
||||||
|
|
Loading…
Reference in New Issue