From 40f82d3484a61db22832dbe169085ae3c30415af Mon Sep 17 00:00:00 2001
From: Shu Muto <shu-mutou@rf.jp.nec.com>
Date: Wed, 31 Jan 2018 16:57:51 +0900
Subject: [PATCH] Add release notes for Queens

Also, fix docs for cloud shell, comments on the source code
and title of help item for runtime.

Change-Id: I90e175bdd7310e9052540948abe05e77e918a54c
---
 doc/source/install/index.rst                  |  4 ++
 .../notes/queens-1a10c0660636d2e0.yaml        | 60 +++++++++++++++++++
 .../cloud-shell/cloud-shell.controller.js     |  2 +-
 .../actions/workflow/spec.help.html           |  2 +-
 4 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/queens-1a10c0660636d2e0.yaml

diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index f410047..dcafdcf 100644
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -47,6 +47,10 @@ And enable it in Horizon::
     cp ../zun-ui/zun_ui/enabled/_2330_project_container_panelgroup.py openstack_dashboard/local/enabled
     cp ../zun-ui/zun_ui/enabled/_2331_project_container_images_panel.py openstack_dashboard/local/enabled
 
+If allow users to use cloud shell::
+
+    cp ../zun-ui/zun_ui/enabled/_0330_cloud_shell.py openstack_dashboard/local/enabled
+
 To run horizon with the newly enabled Zun UI plugin run::
 
     python manage.py runserver 0.0.0.0:8080
diff --git a/releasenotes/notes/queens-1a10c0660636d2e0.yaml b/releasenotes/notes/queens-1a10c0660636d2e0.yaml
new file mode 100644
index 0000000..6f309df
--- /dev/null
+++ b/releasenotes/notes/queens-1a10c0660636d2e0.yaml
@@ -0,0 +1,60 @@
+---
+features:
+  - |
+    Added Cloud Shell feature. See also
+    [`Screen Shot <https://drive.google.com/file/d/0B1UFZO9xX8eweERNX2FWVGRrMXM/view>`_]
+    and [`Short Video <https://youtu.be/lYt2U7qZG38>`_].
+
+    To enable cloud shell, copy zun_ui/enabled/_0330_cloud_shell.py into
+    openstack_dashboard/local/enabled directory and restart Horizon.
+    Then ">_ Cloud Shell" button will be shown right on header of Horizon
+    after loging in.
+
+    When user click "Cloud Shell" button, web console for the cloud shell
+    will be shown in bottom of window.
+
+    At first time to show cloud shell, Zun UI starts to create cloud shell
+    container for the user. So it take just a litle time before using
+    cloud shell. The container will be named
+    "cloud-shell-<user>-<project>-<domain>-<region>".
+
+    If cloud shell container exists, attach the web console to the container.
+
+    Each time when attach to the container, Zun UI gets user's clouds.yaml
+    from Horizon and set it into "~/.config/openstack/clouds.yaml".
+    Also, "export OS_CLOUD=openstack" will be set into "~/.bashrc".
+
+    The user password is not set into the container, so user should
+    set manually "OS_PASSWORD" into envirinment variables or "password"
+    into clouds.yaml.
+
+    To configure image for cloud shell, see
+    [`Image for Cloud Shell <https://docs.openstack.org/zun-ui/latest/configuration/index.html#image-for-cloud-shell>`_]
+  - >
+    [`cinder-integration <https://blueprints.launchpad.net/zun-ui/+spec/cinder-integration>`_]
+    Added Volumes tab for container creation dialog. When create
+    container, user can mount existing Cinder volume or create and mount
+    new Cinder volume.
+  - >
+    Added parameters for container creation. New parameters 'auto_remove',
+    'hostname' and 'runtime' are added for container creation.
+    Also, these parameters are shown in details view.
+    These parameters are not for update, so these are readonly in update
+    dialog.
+  - >
+    Show actions according to container status. Previously the UI showed
+    all of the actions regardless of container's status, now UI  filters
+    the actions just like what nova instances do.
+  - >
+    Added new action "Stop and Delete Container". This action stops the
+    container before deletion when the container is running.
+  - >
+    Added project_id into drawer on image table view.
+fixes:
+  - >
+    [`bug/1742599 <https://bugs.launchpad.net/zun-ui/+bug/1742599>`_]
+    Fixed issue the deleted item is selected again with batch delete.
+    Items recently deleted with batch action had been shown in deletion
+    confirmation dialog when execute the batch delete action again.
+    And this had caused the conflict error due to trying to delete
+    unexisting item.
diff --git a/zun_ui/static/cloud-shell/cloud-shell.controller.js b/zun_ui/static/cloud-shell/cloud-shell.controller.js
index ab57af4..9932682 100644
--- a/zun_ui/static/cloud-shell/cloud-shell.controller.js
+++ b/zun_ui/static/cloud-shell/cloud-shell.controller.js
@@ -46,7 +46,7 @@
     var cols = 80;
     var rows = 24;
 
-    // get openrc v3 for OpenStack Client
+    // get clouds.yaml for OpenStack Client
     var cloudsYaml;
     http.get('/project/api_access/clouds.yaml/').then(function(response) {
       // cloud.yaml to be set to .config/openstack/clouds.yaml in container
diff --git a/zun_ui/static/dashboard/container/containers/actions/workflow/spec.help.html b/zun_ui/static/dashboard/container/containers/actions/workflow/spec.help.html
index fdfca13..06fdf71 100644
--- a/zun_ui/static/dashboard/container/containers/actions/workflow/spec.help.html
+++ b/zun_ui/static/dashboard/container/containers/actions/workflow/spec.help.html
@@ -5,6 +5,6 @@
   <dd translate>The container memory size in MiB.</dd>
   <dt translate>Restart Policy</dt>
   <dd translate>Restart policy to apply when a container exits.</dd>
-  <dt translate>Restart Policy</dt>
+  <dt translate>Runtime</dt>
   <dd translate>The runtime to use for this container. Default: "runc"</dd>
 </dl>