Browse Source

Update Fedora images

New release of Fedora Atomic [1].
The new release of Fedora Ironic includes the same
packages.

Main changes:
Kubernetes 1.5.3
etcd 3.1.3
Plus several fixes and version bumps.

Add :Z when mounting certs in the swarm containers to set
selinux labels properly.

[1] http://www.projectatomic.io/blog/2017/03/fedora_atomic_mar28/

(cherry picked from 706371f380)

Change-Id: Ia2881f5c6b84993850f2642c7a7f240ce6ad3f73
Closes-Bug: #1677664
tags/4.1.1^0
Spyros Trigazis 2 years ago
parent
commit
7be95f28db

+ 1
- 1
magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh View File

@@ -35,7 +35,7 @@ ExecStartPre=-/usr/bin/docker pull swarm:$SWARM_VERSION
35 35
 ExecStart=/usr/bin/docker run   -e http_proxy=$HTTP_PROXY \\
36 36
                                 -e https_proxy=$HTTPS_PROXY \\
37 37
                                 -e no_proxy=$NO_PROXY \\
38
-                                -v $CERT_DIR:$CERT_DIR \\
38
+                                -v $CERT_DIR:$CERT_DIR:Z \\
39 39
                                 --name swarm-agent \\
40 40
                                 swarm:$SWARM_VERSION \\
41 41
                                 join \\

+ 1
- 1
magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh View File

@@ -19,7 +19,7 @@ ExecStartPre=-/usr/bin/docker kill swarm-manager
19 19
 ExecStartPre=-/usr/bin/docker rm swarm-manager
20 20
 ExecStartPre=-/usr/bin/docker pull swarm:$SWARM_VERSION
21 21
 ExecStart=/usr/bin/docker run   --name swarm-manager \\
22
-                                -v $CERT_DIR:$CERT_DIR \\
22
+                                -v $CERT_DIR:$CERT_DIR:Z \\
23 23
                                 -p 2376:2375 \\
24 24
                                 -e http_proxy=$HTTP_PROXY \\
25 25
                                 -e https_proxy=$HTTPS_PROXY \\

+ 1
- 1
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml View File

@@ -286,7 +286,7 @@ parameters:
286 286
   kube_version:
287 287
     type: string
288 288
     description: version of kubernetes used for kubernetes cluster
289
-    default: v1.5.2
289
+    default: v1.5.3
290 290
 
291 291
   insecure_registry_url:
292 292
     type: string

+ 5
- 5
magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md View File

@@ -12,23 +12,23 @@ An example fedora based image and uploaded to glance with the following:
12 12
     export PATH="${PWD}/dib-utils/bin:$PATH"
13 13
     export ELEMENTS_PATH=diskimage-builder/elements
14 14
     export ELEMENTS_PATH=${ELEMENTS_PATH}:magnum/magnum/drivers/k8s_fedora_ironic_v1/image
15
-    export DIB_RELEASE=24
15
+    export DIB_RELEASE=25
16 16
     diskimage-builder/bin/disk-image-create baremetal \
17 17
       fedora selinux-permissive \
18 18
       kubernetes \
19
-      -o fedora-24-kubernetes.qcow2
19
+      -o fedora-25-kubernetes.qcow2
20 20
 
21 21
     KERNEL_ID=`glance image-create --name fedora-k8s-kernel \
22 22
                                    --visibility public \
23 23
                                    --disk-format=aki \
24 24
                                    --container-format=aki \
25
-                                   --file=fedora-24-kubernetes.vmlinuz \
25
+                                   --file=fedora-25-kubernetes.vmlinuz \
26 26
                                    | grep id | tr -d '| ' | cut --bytes=3-57`
27 27
     RAMDISK_ID=`glance image-create --name fedora-k8s-ramdisk \
28 28
                                     --visibility public \
29 29
                                     --disk-format=ari \
30 30
                                     --container-format=ari \
31
-                                    --file=fedora-24-kubernetes.initrd \
31
+                                    --file=fedora-25-kubernetes.initrd \
32 32
                                     | grep id |  tr -d '| ' | cut --bytes=3-57`
33 33
     BASE_ID=`glance image-create --name fedora-k8s \
34 34
                                     --os-distro fedora \
@@ -37,6 +37,6 @@ An example fedora based image and uploaded to glance with the following:
37 37
                                     --container-format=bare \
38 38
                                     --property kernel_id=$KERNEL_ID \
39 39
                                     --property ramdisk_id=$RAMDISK_ID \
40
-                                    --file=fedora-24-kubernetes.qcow2 \
40
+                                    --file=fedora-25-kubernetes.qcow2 \
41 41
                                     | grep -v kernel | grep -v ramdisk \
42 42
                                     | grep id | tr -d '| ' | cut --bytes=3-57`

+ 2
- 1
magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml View File

@@ -1,4 +1,5 @@
1 1
 kubernetes:
2 2
 etcd:
3 3
 flannel:
4
-docker-io:
4
+docker-io:
5
+python2:

+ 1
- 1
magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml View File

@@ -289,7 +289,7 @@ parameters:
289 289
   kube_version:
290 290
     type: string
291 291
     description: version of kubernetes used for kubernetes cluster
292
-    default: v1.5.2
292
+    default: v1.5.3
293 293
 
294 294
   insecure_registry_url:
295 295
     type: string

+ 2
- 2
magnum/tests/contrib/gate_hook.sh View File

@@ -38,8 +38,8 @@ if [ "$coe" = "mesos" ]; then
38 38
 elif [ "$coe" = "k8s-coreos" ]; then
39 39
     export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=http://beta.release.core-os.net/amd64-usr/1298.4.0/coreos_production_openstack_image.img.bz2"
40 40
 elif [ "${coe}${special}" = "k8s-ironic" ]; then
41
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic-ocata.tar.gz'"
42
-    export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic-ocata'"
41
+    export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-kubernetes-ironic-ocata.tar.gz'"
42
+    export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-kubernetes-ironic-ocata'"
43 43
 
44 44
     export DEVSTACK_GATE_VIRT_DRIVER="ironic"
45 45
     # NOTE(yuanying): Current implementation requires only 1 subnet under network

Loading…
Cancel
Save