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
This commit is contained in:
parent
9b93f3a7ab
commit
7be95f28db
|
@ -35,7 +35,7 @@ ExecStartPre=-/usr/bin/docker pull swarm:$SWARM_VERSION
|
||||||
ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY \\
|
ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY \\
|
||||||
-e https_proxy=$HTTPS_PROXY \\
|
-e https_proxy=$HTTPS_PROXY \\
|
||||||
-e no_proxy=$NO_PROXY \\
|
-e no_proxy=$NO_PROXY \\
|
||||||
-v $CERT_DIR:$CERT_DIR \\
|
-v $CERT_DIR:$CERT_DIR:Z \\
|
||||||
--name swarm-agent \\
|
--name swarm-agent \\
|
||||||
swarm:$SWARM_VERSION \\
|
swarm:$SWARM_VERSION \\
|
||||||
join \\
|
join \\
|
||||||
|
|
|
@ -19,7 +19,7 @@ ExecStartPre=-/usr/bin/docker kill swarm-manager
|
||||||
ExecStartPre=-/usr/bin/docker rm swarm-manager
|
ExecStartPre=-/usr/bin/docker rm swarm-manager
|
||||||
ExecStartPre=-/usr/bin/docker pull swarm:$SWARM_VERSION
|
ExecStartPre=-/usr/bin/docker pull swarm:$SWARM_VERSION
|
||||||
ExecStart=/usr/bin/docker run --name swarm-manager \\
|
ExecStart=/usr/bin/docker run --name swarm-manager \\
|
||||||
-v $CERT_DIR:$CERT_DIR \\
|
-v $CERT_DIR:$CERT_DIR:Z \\
|
||||||
-p 2376:2375 \\
|
-p 2376:2375 \\
|
||||||
-e http_proxy=$HTTP_PROXY \\
|
-e http_proxy=$HTTP_PROXY \\
|
||||||
-e https_proxy=$HTTPS_PROXY \\
|
-e https_proxy=$HTTPS_PROXY \\
|
||||||
|
|
|
@ -286,7 +286,7 @@ parameters:
|
||||||
kube_version:
|
kube_version:
|
||||||
type: string
|
type: string
|
||||||
description: version of kubernetes used for kubernetes cluster
|
description: version of kubernetes used for kubernetes cluster
|
||||||
default: v1.5.2
|
default: v1.5.3
|
||||||
|
|
||||||
insecure_registry_url:
|
insecure_registry_url:
|
||||||
type: string
|
type: string
|
||||||
|
|
|
@ -12,23 +12,23 @@ An example fedora based image and uploaded to glance with the following:
|
||||||
export PATH="${PWD}/dib-utils/bin:$PATH"
|
export PATH="${PWD}/dib-utils/bin:$PATH"
|
||||||
export ELEMENTS_PATH=diskimage-builder/elements
|
export ELEMENTS_PATH=diskimage-builder/elements
|
||||||
export ELEMENTS_PATH=${ELEMENTS_PATH}:magnum/magnum/drivers/k8s_fedora_ironic_v1/image
|
export ELEMENTS_PATH=${ELEMENTS_PATH}:magnum/magnum/drivers/k8s_fedora_ironic_v1/image
|
||||||
export DIB_RELEASE=24
|
export DIB_RELEASE=25
|
||||||
diskimage-builder/bin/disk-image-create baremetal \
|
diskimage-builder/bin/disk-image-create baremetal \
|
||||||
fedora selinux-permissive \
|
fedora selinux-permissive \
|
||||||
kubernetes \
|
kubernetes \
|
||||||
-o fedora-24-kubernetes.qcow2
|
-o fedora-25-kubernetes.qcow2
|
||||||
|
|
||||||
KERNEL_ID=`glance image-create --name fedora-k8s-kernel \
|
KERNEL_ID=`glance image-create --name fedora-k8s-kernel \
|
||||||
--visibility public \
|
--visibility public \
|
||||||
--disk-format=aki \
|
--disk-format=aki \
|
||||||
--container-format=aki \
|
--container-format=aki \
|
||||||
--file=fedora-24-kubernetes.vmlinuz \
|
--file=fedora-25-kubernetes.vmlinuz \
|
||||||
| grep id | tr -d '| ' | cut --bytes=3-57`
|
| grep id | tr -d '| ' | cut --bytes=3-57`
|
||||||
RAMDISK_ID=`glance image-create --name fedora-k8s-ramdisk \
|
RAMDISK_ID=`glance image-create --name fedora-k8s-ramdisk \
|
||||||
--visibility public \
|
--visibility public \
|
||||||
--disk-format=ari \
|
--disk-format=ari \
|
||||||
--container-format=ari \
|
--container-format=ari \
|
||||||
--file=fedora-24-kubernetes.initrd \
|
--file=fedora-25-kubernetes.initrd \
|
||||||
| grep id | tr -d '| ' | cut --bytes=3-57`
|
| grep id | tr -d '| ' | cut --bytes=3-57`
|
||||||
BASE_ID=`glance image-create --name fedora-k8s \
|
BASE_ID=`glance image-create --name fedora-k8s \
|
||||||
--os-distro fedora \
|
--os-distro fedora \
|
||||||
|
@ -37,6 +37,6 @@ An example fedora based image and uploaded to glance with the following:
|
||||||
--container-format=bare \
|
--container-format=bare \
|
||||||
--property kernel_id=$KERNEL_ID \
|
--property kernel_id=$KERNEL_ID \
|
||||||
--property ramdisk_id=$RAMDISK_ID \
|
--property ramdisk_id=$RAMDISK_ID \
|
||||||
--file=fedora-24-kubernetes.qcow2 \
|
--file=fedora-25-kubernetes.qcow2 \
|
||||||
| grep -v kernel | grep -v ramdisk \
|
| grep -v kernel | grep -v ramdisk \
|
||||||
| grep id | tr -d '| ' | cut --bytes=3-57`
|
| grep id | tr -d '| ' | cut --bytes=3-57`
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
kubernetes:
|
kubernetes:
|
||||||
etcd:
|
etcd:
|
||||||
flannel:
|
flannel:
|
||||||
docker-io:
|
docker-io:
|
||||||
|
python2:
|
||||||
|
|
|
@ -289,7 +289,7 @@ parameters:
|
||||||
kube_version:
|
kube_version:
|
||||||
type: string
|
type: string
|
||||||
description: version of kubernetes used for kubernetes cluster
|
description: version of kubernetes used for kubernetes cluster
|
||||||
default: v1.5.2
|
default: v1.5.3
|
||||||
|
|
||||||
insecure_registry_url:
|
insecure_registry_url:
|
||||||
type: string
|
type: string
|
||||||
|
|
|
@ -38,8 +38,8 @@ if [ "$coe" = "mesos" ]; then
|
||||||
elif [ "$coe" = "k8s-coreos" ]; then
|
elif [ "$coe" = "k8s-coreos" ]; then
|
||||||
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"
|
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"
|
||||||
elif [ "${coe}${special}" = "k8s-ironic" ]; then
|
elif [ "${coe}${special}" = "k8s-ironic" ]; then
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic-ocata.tar.gz'"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-kubernetes-ironic-ocata.tar.gz'"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic-ocata'"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-kubernetes-ironic-ocata'"
|
||||||
|
|
||||||
export DEVSTACK_GATE_VIRT_DRIVER="ironic"
|
export DEVSTACK_GATE_VIRT_DRIVER="ironic"
|
||||||
# NOTE(yuanying): Current implementation requires only 1 subnet under network
|
# NOTE(yuanying): Current implementation requires only 1 subnet under network
|
||||||
|
|
Loading…
Reference in New Issue