From d69b47d8d59adf157ac18deea8ddc361fe5c15ca Mon Sep 17 00:00:00 2001 From: Xinliang Liu Date: Mon, 9 Dec 2019 18:22:34 +0800 Subject: [PATCH] Add fedora-coreos distro Fedora-coreos driver has been added in train. So make its image can be chosen in the UI. Make distros listed in order. Closes-Bug: #1855691 Change-Id: Ic436022b36470870f1ba6903515cee5b2bb1725f (cherry picked from commit 7853f0a4f231f2e73232806584acc498879ccc52) --- .../cluster-templates/cluster-templates.module.js | 2 +- releasenotes/notes/add-fedora-coreos-7882a33d801371fe.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/add-fedora-coreos-7882a33d801371fe.yaml diff --git a/magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js b/magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js index a0ab4354..24625964 100644 --- a/magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js +++ b/magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js @@ -60,7 +60,7 @@ * @description A list available image distros for magnum */ function distros() { - return ["fedora-atomic", "coreos", "ubuntu"]; + return ["coreos", "fedora-atomic", "fedora-coreos", "ubuntu"]; } run.$inject = [ diff --git a/releasenotes/notes/add-fedora-coreos-7882a33d801371fe.yaml b/releasenotes/notes/add-fedora-coreos-7882a33d801371fe.yaml new file mode 100644 index 00000000..48a9ad21 --- /dev/null +++ b/releasenotes/notes/add-fedora-coreos-7882a33d801371fe.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Add fedora-coreos image support. User can choose an image with property + 'os_distro=fedora-coreos' on horizon UI when creating a k8s cluster template.