summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-08 23:56:43 +0000
committerGerrit Code Review <review@openstack.org>2019-01-08 23:56:43 +0000
commit234f000e6bf017eef79a2906b6ba556f5d8bb9fc (patch)
tree3d5b1cc24eb94edac053acb226e8548fece948d2
parent240f808ce7b324f11564d2b56031c0b2af21482e (diff)
parent5085f23fdfcae315e4da5864bfde485a6fb4f39a (diff)
Merge "Update to Fedora 29"
-rw-r--r--diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash2
-rw-r--r--diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash8
-rw-r--r--doc/source/user_guide/supported_distros.rst4
-rw-r--r--roles/dib-setup-gate-mirrors/tasks/main.yaml5
-rw-r--r--roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora-updates.repo.j210
-rw-r--r--roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora.repo.j210
-rw-r--r--roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j22
7 files changed, 11 insertions, 30 deletions
diff --git a/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash b/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash
index 7c889e5..7bda04c 100644
--- a/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash
+++ b/diskimage_builder/elements/fedora-minimal/environment.d/10-fedora-distro-name.bash
@@ -1,2 +1,2 @@
1export DISTRO_NAME=fedora 1export DISTRO_NAME=fedora
2export DIB_RELEASE=${DIB_RELEASE:-28} 2export DIB_RELEASE=${DIB_RELEASE:-29}
diff --git a/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash b/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
index 90af79c..4fb4028 100644
--- a/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
+++ b/diskimage_builder/elements/fedora/environment.d/10-fedora-distro-name.bash
@@ -1,5 +1,5 @@
1export DISTRO_NAME=fedora 1export DISTRO_NAME=fedora
2export DIB_RELEASE=${DIB_RELEASE:-28} 2export DIB_RELEASE=${DIB_RELEASE:-29}
3 3
4# Note the filename URL has a "sub-release" in it 4# Note the filename URL has a "sub-release" in it
5# http:// ... Fedora-Cloud-Base-25-1.3.x86_64.qcow2 5# http:// ... Fedora-Cloud-Base-25-1.3.x86_64.qcow2
@@ -11,10 +11,10 @@ export DIB_RELEASE=${DIB_RELEASE:-28}
11# 11#
12# [1] https://lists.fedoraproject.org/archives/list/cloud@lists.fedoraproject.org/thread/2WFO2FKIGUQYRQXIR35UVJGRHF7LQENJ/ 12# [1] https://lists.fedoraproject.org/archives/list/cloud@lists.fedoraproject.org/thread/2WFO2FKIGUQYRQXIR35UVJGRHF7LQENJ/
13 13
14if [[ ${DIB_RELEASE} == '27' ]]; then 14if [[ ${DIB_RELEASE} == '28' ]]; then
15 export DIB_FEDORA_SUBRELEASE=1.6
16elif [[ ${DIB_RELEASE} == '28' ]]; then
17 export DIB_FEDORA_SUBRELEASE=1.1 15 export DIB_FEDORA_SUBRELEASE=1.1
16elif [[ ${DIB_RELEASE} == '29' ]]; then
17 export DIB_FEDORA_SUBRELEASE=1.2
18else 18else
19 echo "Unsupported Fedora release" 19 echo "Unsupported Fedora release"
20 exit 1 20 exit 1
diff --git a/doc/source/user_guide/supported_distros.rst b/doc/source/user_guide/supported_distros.rst
index 74559e2..ee6d253 100644
--- a/doc/source/user_guide/supported_distros.rst
+++ b/doc/source/user_guide/supported_distros.rst
@@ -5,7 +5,7 @@ Distributions which are supported as a build host:
5 5
6- Centos 6, 7 6- Centos 6, 7
7- Debian 8 ("jessie") 7- Debian 8 ("jessie")
8- Fedora 27, 28 8- Fedora 28, 29
9- RHEL 6, 7 9- RHEL 6, 7
10- Ubuntu 14.04 ("trusty") 10- Ubuntu 14.04 ("trusty")
11- Gentoo 11- Gentoo
@@ -16,7 +16,7 @@ Distributions which are supported as a target for an image:
16 16
17- Centos 6, 7 17- Centos 6, 7
18- Debian 8 ("jessie") 18- Debian 8 ("jessie")
19- Fedora 27, 28 19- Fedora 28, 29
20- RHEL 6, 7 20- RHEL 6, 7
21- Ubuntu 12.04 ("precise"), 14.04 ("trusty") 21- Ubuntu 12.04 ("precise"), 14.04 ("trusty")
22- Gentoo 22- Gentoo
diff --git a/roles/dib-setup-gate-mirrors/tasks/main.yaml b/roles/dib-setup-gate-mirrors/tasks/main.yaml
index da7521d..862b68a 100644
--- a/roles/dib-setup-gate-mirrors/tasks/main.yaml
+++ b/roles/dib-setup-gate-mirrors/tasks/main.yaml
@@ -28,9 +28,10 @@
28 state: directory 28 state: directory
29 mode: 0775 29 mode: 0775
30 recurse: yes 30 recurse: yes
31 # sometimes Fedora moves things and we need different versions; keep
32 # the loops for future use.
31 with_items: 33 with_items:
32 - default 34 - default
33 - '28'
34 35
35- name: Install fedora-minimal repo files 36- name: Install fedora-minimal repo files
36 template: 37 template:
@@ -38,5 +39,5 @@
38 mode: 0644 39 mode: 0644
39 src: "fedora-minimal/{{ item[0] }}/{{ item[1] }}.j2" 40 src: "fedora-minimal/{{ item[0] }}/{{ item[1] }}.j2"
40 with_nested: 41 with_nested:
41 - [ 'default', '28' ] 42 - [ 'default' ]
42 - [ 'fedora.repo', 'fedora-updates.repo' ] 43 - [ 'fedora.repo', 'fedora-updates.repo' ]
diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora-updates.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora-updates.repo.j2
deleted file mode 100644
index 5725c66..0000000
--- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora-updates.repo.j2
+++ /dev/null
@@ -1,10 +0,0 @@
1[updates]
2name=Fedora $releasever - $basearch - Updates
3failovermethod=priority
4baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/Everything/$basearch/
5enabled=1
6gpgcheck=0
7metadata_expire=6h
8skip_if_unavailable=False
9deltarpm=False
10deltarpm_percentage=0
diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora.repo.j2
deleted file mode 100644
index 74853f8..0000000
--- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/28/fedora.repo.j2
+++ /dev/null
@@ -1,10 +0,0 @@
1[fedora]
2name=Fedora $releasever - $basearch
3failovermethod=priority
4baseurl=http://{{ mirror_fqdn }}/fedora/releases/$releasever/Everything/$basearch/os/
5enabled=1
6metadata_expire=7d
7gpgcheck=0
8skip_if_unavailable=False
9deltarpm=False
10deltarpm_percentage=0
diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
index 79ecb21..5725c66 100644
--- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
+++ b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2
@@ -1,7 +1,7 @@
1[updates] 1[updates]
2name=Fedora $releasever - $basearch - Updates 2name=Fedora $releasever - $basearch - Updates
3failovermethod=priority 3failovermethod=priority
4baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/$basearch/ 4baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/Everything/$basearch/
5enabled=1 5enabled=1
6gpgcheck=0 6gpgcheck=0
7metadata_expire=6h 7metadata_expire=6h