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/

Closes-Bug: #1677664

Change-Id: I2539ae83401db5b34716ebd4bbdfbe288f5c768b
changes/10/451710/10
Spyros Trigazis 5 years ago
parent
commit
c5a4a18104
  1. 2
      magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh
  2. 2
      magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh
  3. 2
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
  4. 10
      magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md
  5. 3
      magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml
  6. 2
      magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml
  7. 8
      magnum/tests/contrib/gate_hook.sh

2
magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh

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

2
magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh

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

2
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml

@ -299,7 +299,7 @@ parameters:
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
default: v1.5.2
default: v1.5.3
insecure_registry_url:
type: string

10
magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md

@ -12,23 +12,23 @@ An example fedora based image and uploaded to glance with the following:
export PATH="${PWD}/dib-utils/bin:$PATH"
export ELEMENTS_PATH=diskimage-builder/elements
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 \
fedora selinux-permissive \
kubernetes \
-o fedora-24-kubernetes.qcow2
-o fedora-25-kubernetes.qcow2
KERNEL_ID=`glance image-create --name fedora-k8s-kernel \
--visibility public \
--disk-format=aki \
--container-format=aki \
--file=fedora-24-kubernetes.vmlinuz \
--file=fedora-25-kubernetes.vmlinuz \
| grep id | tr -d '| ' | cut --bytes=3-57`
RAMDISK_ID=`glance image-create --name fedora-k8s-ramdisk \
--visibility public \
--disk-format=ari \
--container-format=ari \
--file=fedora-24-kubernetes.initrd \
--file=fedora-25-kubernetes.initrd \
| grep id | tr -d '| ' | cut --bytes=3-57`
BASE_ID=`glance image-create --name fedora-k8s \
--os-distro fedora \
@ -37,6 +37,6 @@ An example fedora based image and uploaded to glance with the following:
--container-format=bare \
--property kernel_id=$KERNEL_ID \
--property ramdisk_id=$RAMDISK_ID \
--file=fedora-24-kubernetes.qcow2 \
--file=fedora-25-kubernetes.qcow2 \
| grep -v kernel | grep -v ramdisk \
| grep id | tr -d '| ' | cut --bytes=3-57`

3
magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml

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

2
magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml

@ -302,7 +302,7 @@ parameters:
kube_version:
type: string
description: version of kubernetes used for kubernetes cluster
default: v1.5.2
default: v1.5.3
insecure_registry_url:
type: string

8
magnum/tests/contrib/gate_hook.sh

@ -38,8 +38,8 @@ if [ "$coe" = "mesos" ]; then
elif [ "$coe" = "k8s-coreos" ]; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2"
elif [ "${coe}${special}" = "k8s-ironic" ]; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-25-kubernetes-ironic.tar.gz'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-25-kubernetes-ironic'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-kubernetes-ironic-latest.tar.gz'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-kubernetes-ironic-latest'"
export DEVSTACK_GATE_VIRT_DRIVER="ironic"
# NOTE(yuanying): Current implementation requires only 1 subnet under network
@ -75,8 +75,8 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_DISK=10"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=5"
else
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-atomic-25-latest.qcow2'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-25-latest'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2'"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-latest'"
fi
# Enable magnum plugin in the last step

Loading…
Cancel
Save