diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh index faddf0052e..3e3447191c 100644 --- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh +++ b/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 \\ diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh index fbb1a17a93..eefba1914c 100644 --- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh +++ b/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 \\ diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index 22c8b16e26..cec634f7a6 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/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 diff --git a/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md b/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md index 066fa6bc33..9df646cdc1 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md +++ b/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` diff --git a/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml b/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml index ea99a147d8..28b297717b 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml +++ b/magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml @@ -1,4 +1,5 @@ kubernetes: etcd: flannel: -docker-io: \ No newline at end of file +docker-io: +python2: diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml index e46923310c..8d26bd7eff 100644 --- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml +++ b/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 diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh index 8ac2d5cc14..42330f748e 100755 --- a/magnum/tests/contrib/gate_hook.sh +++ b/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