From 4829ed2c87ac89ed3415b0dff94e7a8be4be80ca Mon Sep 17 00:00:00 2001
From: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>
Date: Tue, 21 Nov 2017 14:30:51 +0300
Subject: [PATCH] Move Cinder backend passwords to passwords.yml
Move Hitachi NAS and Oracle ZFSSA passwords
to /etc/kolla/passwords.yml
Change-Id: I1c94c45701fda5430b5d5a88c719db13d1956b11
Closes-Bug: #1733565
---
ansible/roles/cinder/defaults/main.yml | 3 ---
doc/source/reference/cinder-guide-hnas.rst | 14 ++++++++++++--
etc/kolla/passwords.yml | 11 +++++++++++
.../move-storage-passwords-09b5afc839284321.yaml | 8 ++++++++
4 files changed, 31 insertions(+), 5 deletions(-)
create mode 100644 releasenotes/notes/move-storage-passwords-09b5afc839284321.yaml
diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml
index 473d682155..930beb1d7f 100644
--- a/ansible/roles/cinder/defaults/main.yml
+++ b/ansible/roles/cinder/defaults/main.yml
@@ -153,7 +153,6 @@ cinder_iscsi_helper: "tgtadm"
# iscsi
hnas_iscsi_backend: "hnas_iscsi_backend"
hnas_iscsi_username:
-hnas_iscsi_password:
hnas_iscsi_mgmt_ip0:
hnas_iscsi_svc0_volume_type:
hnas_iscsi_svc0_hdp:
@@ -162,7 +161,6 @@ hnas_iscsi_svc0_ip:
# nfs
hnas_nfs_backend: "hnas_nfs_backend"
hnas_nfs_username:
-hnas_nfs_password:
hnas_nfs_mgmt_ip0:
hnas_nfs_svc0_volume_type:
hnas_nfs_svc0_hdp:
@@ -173,7 +171,6 @@ hnas_nfs_svc0_hdp:
zfssa_iscsi_backend: "zfssa_iscsi_backend"
zfssa_iscsi_san_ip:
zfssa_iscsi_login:
-zfssa_iscsi_password:
zfssa_iscsi_pool:
zfssa_iscsi_project:
zfssa_iscsi_initiator_group:
diff --git a/doc/source/reference/cinder-guide-hnas.rst b/doc/source/reference/cinder-guide-hnas.rst
index 53d3c42f46..827704f5c5 100644
--- a/doc/source/reference/cinder-guide-hnas.rst
+++ b/doc/source/reference/cinder-guide-hnas.rst
@@ -76,7 +76,6 @@ contents:
volume_driver = cinder.volume.drivers.hitachi.hnas_iscsi.HNASISCSIDriver
volume_iscsi_backend = hnas_iscsi_backend
hnas_iscsi_username = supervisor
- hnas_iscsi_password = supervisor
hnas_iscsi_mgmt_ip0 = <hnas_ip>
hnas_chap_enabled = True
@@ -84,6 +83,12 @@ contents:
hnas_iscsi_svc0_hdp = FS-Baremetal1
hnas_iscsi_svc0_iscsi_ip = <svc0_ip>
+Then set password for the backend in ``/etc/kolla/passwords.yml``:
+
+.. code-block:: console
+
+ hnas_iscsi_password: supervisor
+
NFS backend
-----------
@@ -105,13 +110,18 @@ add the contents:
volume_driver = cinder.volume.drivers.hitachi.hnas_nfs.HNASNFSDriver
volume_nfs_backend = hnas_nfs_backend
hnas_nfs_username = supervisor
- hnas_nfs_password = supervisor
hnas_nfs_mgmt_ip0 = <hnas_ip>
hnas_chap_enabled = True
hnas_nfs_svc0_volume_type = nfs_gold
hnas_nfs_svc0_hdp = <svc0_ip>/<export_name>
+Then set password for the backend in ``/etc/kolla/passwords.yml``:
+
+.. code-block:: console
+
+ hnas_nfs_password: supervisor
+
Configuration on Kolla deployment
---------------------------------
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
index 1b659da29d..69c5c5ae98 100644
--- a/etc/kolla/passwords.yml
+++ b/etc/kolla/passwords.yml
@@ -34,6 +34,17 @@ vmware_dvs_host_password:
vmware_nsxv_password:
vmware_vcenter_host_password:
+#####################
+# Hitachi NAS support
+#####################
+hnas_iscsi_password:
+hnas_nfs_password:
+
+######################
+# Oracle ZFSSA support
+######################
+zfssa_iscsi_password:
+
####################
# OpenStack options
####################
diff --git a/releasenotes/notes/move-storage-passwords-09b5afc839284321.yaml b/releasenotes/notes/move-storage-passwords-09b5afc839284321.yaml
new file mode 100644
index 0000000000..cbd02f790b
--- /dev/null
+++ b/releasenotes/notes/move-storage-passwords-09b5afc839284321.yaml
@@ -0,0 +1,8 @@
+---
+features:
+ - |
+ Move storage backend passwords from main.yml to /etc/kolla/passwords.yml
+upgrade:
+ - |
+ Before upgrading one needs to set Hitachi NAS and Oracle ZFSSA passwors in
+ /etc/kolla/passwords.yml file.