summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpyros Trigazis <strigazi@gmail.com>2017-03-30 11:10:46 +0200
committerSpyros Trigazis <strigazi@gmail.com>2017-04-12 07:30:11 +0000
commit7be95f28db6c796f385f6ea31652aaf4790b67ec (patch)
tree3a67e0e46c68f290794f897cfebf6493b861ced6
parent9b93f3a7ab60090f27c54e1ff9d1a755afb66cce (diff)
Update Fedora images4.1.1
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 706371f380f52f96e920f50595b0632bf59b2ef7) Change-Id: Ia2881f5c6b84993850f2642c7a7f240ce6ad3f73 Closes-Bug: #1677664
Notes
Notes (review): Code-Review+2: yatin <ykarel@redhat.com> Code-Review+1: Corey O'Brien <coreypobrien@gmail.com> Code-Review+2: Ton Ngo <ton@us.ibm.com> Workflow+1: Ton Ngo <ton@us.ibm.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 25 Apr 2017 19:55:58 +0000 Reviewed-on: https://review.openstack.org/452102 Project: openstack/magnum Branch: refs/heads/stable/ocata
-rw-r--r--magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh2
-rw-r--r--magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh2
-rw-r--r--magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml2
-rw-r--r--magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/Readme.md10
-rw-r--r--magnum/drivers/k8s_fedora_ironic_v1/image/kubernetes/package-installs.yaml3
-rw-r--r--magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml2
-rwxr-xr-xmagnum/tests/contrib/gate_hook.sh4
7 files changed, 13 insertions, 12 deletions
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 faddf00..3e34471 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
35ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY \\ 35ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY \\
36 -e https_proxy=$HTTPS_PROXY \\ 36 -e https_proxy=$HTTPS_PROXY \\
37 -e no_proxy=$NO_PROXY \\ 37 -e no_proxy=$NO_PROXY \\
38 -v $CERT_DIR:$CERT_DIR \\ 38 -v $CERT_DIR:$CERT_DIR:Z \\
39 --name swarm-agent \\ 39 --name swarm-agent \\
40 swarm:$SWARM_VERSION \\ 40 swarm:$SWARM_VERSION \\
41 join \\ 41 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 fbb1a17..eefba19 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
19ExecStartPre=-/usr/bin/docker rm swarm-manager 19ExecStartPre=-/usr/bin/docker rm swarm-manager
20ExecStartPre=-/usr/bin/docker pull swarm:$SWARM_VERSION 20ExecStartPre=-/usr/bin/docker pull swarm:$SWARM_VERSION
21ExecStart=/usr/bin/docker run --name swarm-manager \\ 21ExecStart=/usr/bin/docker run --name swarm-manager \\
22 -v $CERT_DIR:$CERT_DIR \\ 22 -v $CERT_DIR:$CERT_DIR:Z \\
23 -p 2376:2375 \\ 23 -p 2376:2375 \\
24 -e http_proxy=$HTTP_PROXY \\ 24 -e http_proxy=$HTTP_PROXY \\
25 -e https_proxy=$HTTPS_PROXY \\ 25 -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 d2fad74..8eec685 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
@@ -286,7 +286,7 @@ parameters:
286 kube_version: 286 kube_version:
287 type: string 287 type: string
288 description: version of kubernetes used for kubernetes cluster 288 description: version of kubernetes used for kubernetes cluster
289 default: v1.5.2 289 default: v1.5.3
290 290
291 insecure_registry_url: 291 insecure_registry_url:
292 type: string 292 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 066fa6b..9df646c 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:
12 export PATH="${PWD}/dib-utils/bin:$PATH" 12 export PATH="${PWD}/dib-utils/bin:$PATH"
13 export ELEMENTS_PATH=diskimage-builder/elements 13 export ELEMENTS_PATH=diskimage-builder/elements
14 export ELEMENTS_PATH=${ELEMENTS_PATH}:magnum/magnum/drivers/k8s_fedora_ironic_v1/image 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 diskimage-builder/bin/disk-image-create baremetal \ 16 diskimage-builder/bin/disk-image-create baremetal \
17 fedora selinux-permissive \ 17 fedora selinux-permissive \
18 kubernetes \ 18 kubernetes \
19 -o fedora-24-kubernetes.qcow2 19 -o fedora-25-kubernetes.qcow2
20 20
21 KERNEL_ID=`glance image-create --name fedora-k8s-kernel \ 21 KERNEL_ID=`glance image-create --name fedora-k8s-kernel \
22 --visibility public \ 22 --visibility public \
23 --disk-format=aki \ 23 --disk-format=aki \
24 --container-format=aki \ 24 --container-format=aki \
25 --file=fedora-24-kubernetes.vmlinuz \ 25 --file=fedora-25-kubernetes.vmlinuz \
26 | grep id | tr -d '| ' | cut --bytes=3-57` 26 | grep id | tr -d '| ' | cut --bytes=3-57`
27 RAMDISK_ID=`glance image-create --name fedora-k8s-ramdisk \ 27 RAMDISK_ID=`glance image-create --name fedora-k8s-ramdisk \
28 --visibility public \ 28 --visibility public \
29 --disk-format=ari \ 29 --disk-format=ari \
30 --container-format=ari \ 30 --container-format=ari \
31 --file=fedora-24-kubernetes.initrd \ 31 --file=fedora-25-kubernetes.initrd \
32 | grep id | tr -d '| ' | cut --bytes=3-57` 32 | grep id | tr -d '| ' | cut --bytes=3-57`
33 BASE_ID=`glance image-create --name fedora-k8s \ 33 BASE_ID=`glance image-create --name fedora-k8s \
34 --os-distro fedora \ 34 --os-distro fedora \
@@ -37,6 +37,6 @@ An example fedora based image and uploaded to glance with the following:
37 --container-format=bare \ 37 --container-format=bare \
38 --property kernel_id=$KERNEL_ID \ 38 --property kernel_id=$KERNEL_ID \
39 --property ramdisk_id=$RAMDISK_ID \ 39 --property ramdisk_id=$RAMDISK_ID \
40 --file=fedora-24-kubernetes.qcow2 \ 40 --file=fedora-25-kubernetes.qcow2 \
41 | grep -v kernel | grep -v ramdisk \ 41 | grep -v kernel | grep -v ramdisk \
42 | grep id | tr -d '| ' | cut --bytes=3-57` 42 | 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 ea99a14..28b2977 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 @@
1kubernetes: 1kubernetes:
2etcd: 2etcd:
3flannel: 3flannel:
4docker-io: \ No newline at end of file 4docker-io:
5python2:
diff --git a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml
index 03d7a87..7b1e64d 100644
--- a/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml
@@ -289,7 +289,7 @@ parameters:
289 kube_version: 289 kube_version:
290 type: string 290 type: string
291 description: version of kubernetes used for kubernetes cluster 291 description: version of kubernetes used for kubernetes cluster
292 default: v1.5.2 292 default: v1.5.3
293 293
294 insecure_registry_url: 294 insecure_registry_url:
295 type: string 295 type: string
diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh
index 63c4e70..5a29715 100755
--- a/magnum/tests/contrib/gate_hook.sh
+++ b/magnum/tests/contrib/gate_hook.sh
@@ -38,8 +38,8 @@ if [ "$coe" = "mesos" ]; then
38elif [ "$coe" = "k8s-coreos" ]; then 38elif [ "$coe" = "k8s-coreos" ]; then
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" 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"
40elif [ "${coe}${special}" = "k8s-ironic" ]; then 40elif [ "${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'" 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-25-kubernetes-ironic-ocata'" 42 export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-kubernetes-ironic-ocata'"
43 43
44 export DEVSTACK_GATE_VIRT_DRIVER="ironic" 44 export DEVSTACK_GATE_VIRT_DRIVER="ironic"
45 # NOTE(yuanying): Current implementation requires only 1 subnet under network 45 # NOTE(yuanying): Current implementation requires only 1 subnet under network