Fixed overwriting of astute.yaml
Fixed examples of repos in config sample Change-Id: I40cb0299393336a038f996a56bdb7aaa95366e44 Closes-Bug: #1527196
This commit is contained in:
Artur Svechnikov
parent
f4c22a341c
commit
13c45fe510
|
|
@ -46,67 +46,67 @@ packages:
|
|||
#http_proxy: "192.168.1.50:8080"
|
||||
#https_proxy: "192.168.1.50:8080"
|
||||
# Define upstream ubuntu-mirror
|
||||
ubuntu_repos:
|
||||
-
|
||||
name: ubuntu
|
||||
priority: null
|
||||
section: "main universe multiverse"
|
||||
suite: trusty
|
||||
type: deb
|
||||
uri: "http://archive.ubuntu.com/ubuntu"
|
||||
-
|
||||
name: ubuntu-updates
|
||||
priority: null
|
||||
section: "main universe multiverse"
|
||||
suite: trusty-updates
|
||||
type: deb
|
||||
uri: "http://archive.ubuntu.com/ubuntu"
|
||||
-
|
||||
name: ubuntu-security
|
||||
priority: null
|
||||
section: "main universe multiverse"
|
||||
suite: trusty-security
|
||||
type: deb
|
||||
uri: "http://archive.ubuntu.com/ubuntu"
|
||||
# Define MirantisOpenstack mirror
|
||||
mos_repos:
|
||||
-
|
||||
name: mos
|
||||
priority: "1050"
|
||||
section: "main restricted"
|
||||
suite: mos8.0
|
||||
type: deb
|
||||
uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0"
|
||||
-
|
||||
name: mos-updates
|
||||
priority: "1050"
|
||||
section: "main restricted"
|
||||
suite: mos8.0-updates
|
||||
type: deb
|
||||
uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0"
|
||||
-
|
||||
name: mos-security
|
||||
priority: "1050"
|
||||
section: "main restricted"
|
||||
suite: mos8.0-security
|
||||
type: deb
|
||||
uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0"
|
||||
-
|
||||
name: mos-holdback
|
||||
priority: "1100"
|
||||
section: "main restricted"
|
||||
suite: mos8.0-holdback
|
||||
type: deb
|
||||
uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0"
|
||||
# Define other deb repositories
|
||||
extra_repos:
|
||||
-
|
||||
name: Extra_repo
|
||||
priority: null
|
||||
section: main
|
||||
suite: trusty
|
||||
type: deb
|
||||
uri: "http://archive.ubuntu.com/ubuntu"
|
||||
#ubuntu_repos:
|
||||
# -
|
||||
# name: ubuntu
|
||||
# priority: null
|
||||
# section: "main universe multiverse"
|
||||
# suite: trusty
|
||||
# type: deb
|
||||
# uri: "http://archive.ubuntu.com/ubuntu"
|
||||
# -
|
||||
# name: ubuntu-updates
|
||||
# priority: null
|
||||
# section: "main universe multiverse"
|
||||
# suite: trusty-updates
|
||||
# type: deb
|
||||
# uri: "http://archive.ubuntu.com/ubuntu"
|
||||
# -
|
||||
# name: ubuntu-security
|
||||
# priority: null
|
||||
# section: "main universe multiverse"
|
||||
# suite: trusty-security
|
||||
# type: deb
|
||||
# uri: "http://archive.ubuntu.com/ubuntu"
|
||||
## Define MirantisOpenstack mirror
|
||||
#mos_repos:
|
||||
# -
|
||||
# name: mos
|
||||
# priority: "1050"
|
||||
# section: "main restricted"
|
||||
# suite: mos8.0
|
||||
# type: deb
|
||||
# uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0"
|
||||
# -
|
||||
# name: mos-updates
|
||||
# priority: "1050"
|
||||
# section: "main restricted"
|
||||
# suite: mos8.0-updates
|
||||
# type: deb
|
||||
# uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0"
|
||||
# -
|
||||
# name: mos-security
|
||||
# priority: "1050"
|
||||
# section: "main restricted"
|
||||
# suite: mos8.0-security
|
||||
# type: deb
|
||||
# uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0"
|
||||
# -
|
||||
# name: mos-holdback
|
||||
# priority: "1100"
|
||||
# section: "main restricted"
|
||||
# suite: mos8.0-holdback
|
||||
# type: deb
|
||||
# uri: "http://mirror.fuel-infra.org/mos-repos/ubuntu/8.0"
|
||||
## Define other deb repositories
|
||||
#extra_repos:
|
||||
# -
|
||||
# name: Extra_repo
|
||||
# priority: null
|
||||
# section: main
|
||||
# suite: trusty
|
||||
# type: deb
|
||||
# uri: "http://archive.ubuntu.com/ubuntu"
|
||||
# For import\activate commands only.
|
||||
bootstrap_images_dir: "/var/www/nailgun/bootstraps"
|
||||
# For import\activate commands only
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ def _update_astute_yaml(flavor=None):
|
|||
try:
|
||||
with open(config, 'r') as f:
|
||||
data = yaml.safe_load(f)
|
||||
data.update({'BOOTSTRAP': {'flavor': flavor}})
|
||||
data['BOOTSTRAP']['flavor'] = flavor
|
||||
with open(config, 'wt') as f:
|
||||
yaml.safe_dump(data, stream=f, encoding='utf-8',
|
||||
default_flow_style=False,
|
||||
|
|
@ -170,8 +170,9 @@ def _update_astute_yaml(flavor=None):
|
|||
except IOError:
|
||||
LOG.error("Config file %s has not been processed successfully", config)
|
||||
raise
|
||||
except AttributeError:
|
||||
LOG.error("Seems %s config file is empty", config)
|
||||
except (KeyError, TypeError):
|
||||
LOG.error("Seems config file %s is empty or doesn't contain BOOTSTRAP"
|
||||
" section", config)
|
||||
raise
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ cp -a %{_builddir}/%{name}-%{version}/contrib/ironic/bootstrap-files/* %{buildro
|
|||
cd %{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/fuel_bootstrap_cli/ && PBR_VERSION=%{version} python setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=%{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/fuel_bootstrap_cli/INSTALLED_FILES
|
||||
install -d -m 755 %{buildroot}%{_sysconfdir}/fuel-bootstrap-cli
|
||||
install -p -D -m 644 %{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample %{buildroot}%{_sysconfdir}/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml
|
||||
install -p -D -m 644 %{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/settings.yaml.sample %{buildroot}%{_sysconfdir}/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml.sample
|
||||
install -d -m 755 %{buildroot}%{_datadir}/fuel_bootstrap_cli/files/
|
||||
cp -a %{_builddir}/%{name}-%{version}/contrib/fuel_bootstrap/files/* %{buildroot}%{_datadir}/fuel_bootstrap_cli/files/
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue