From 9db257b13f9683bcd33a063dae6856abe8026968 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Fri, 29 Sep 2017 09:20:39 +0200
Subject: [PATCH] Move vmware password parameters to passwords.yml

Change-Id: Ie26c6b392c5ac86c3ec5effa5241ce5cad10fe40
---
 ansible/group_vars/all.yml                    |  7 +++--
 ansible/roles/neutron/defaults/main.yml       |  2 --
 doc/source/reference/vmware-guide.rst         | 27 ++++++++++++++++---
 etc/kolla/passwords.yml                       |  7 +++++
 ...ers-to-passwords-yml-b6a375e0eb8cf27f.yaml |  5 ++++
 5 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 releasenotes/notes/move-vmware-password-parameters-to-passwords-yml-b6a375e0eb8cf27f.yaml

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index a7de1e6d59..974a94910b 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -636,12 +636,11 @@ ceph_cache_rule: "cache host firstn"
 ceph_pool_pg_num: 128
 ceph_pool_pgp_num: 128
 
-################################################
-# VMware - OpenStack VMware support
-################################################
+#####################
+# VMware support
+######################
 vmware_vcenter_host_ip: "127.0.0.1"
 vmware_vcenter_host_username: "username"
-vmware_vcenter_host_password: "password"
 vmware_vcenter_cluster_name: "cluster-1"
 vmware_vcenter_insecure: "True"
 
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index e52d60a692..9de77a24c2 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -280,7 +280,6 @@ neutron_agent_extensions: "{{ agent_extensions | selectattr('enabled', 'equalto'
 # VMware NSXV
 ####################
 vmware_nsxv_user: "nsx_manager_user"
-vmware_nsxv_password: "nsx_manager_password"
 vmware_nsxv_manager_uri: "https://127.0.0.1"
 vmware_nsxv_insecure: "True"
 vmware_nsxv_cluster_moid: "TestCluster"
@@ -301,7 +300,6 @@ vmware_nsxv_edge_ha: "false"
 vmware_dvs_host_ip: "192.168.1.1"
 vmware_dvs_host_port: "443"
 vmware_dvs_host_username: "admin"
-vmware_dvs_host_password: "password"
 vmware_dvs_insecure: "True"
 vmware_dvs_dvs_name: "VDS-1"
 vmware_dvs_dhcp_override_mac: ""
diff --git a/doc/source/reference/vmware-guide.rst b/doc/source/reference/vmware-guide.rst
index 1b4ab108b8..5559b95799 100644
--- a/doc/source/reference/vmware-guide.rst
+++ b/doc/source/reference/vmware-guide.rst
@@ -150,17 +150,23 @@ Options for nova-compute and ceilometer:
 
     vmware_vcenter_host_ip: "127.0.0.1"
     vmware_vcenter_host_username: "admin"
-    vmware_vcenter_host_password: "admin"
     vmware_vcenter_cluster_name: "cluster-1"
     vmware_vcenter_insecure: "True"
     vmware_vcenter_datastore_regex: ".*"
 
+.. note::
+
+    The VMware vCenter password has to be set in ``/etc/kolla/passwords.yml``.
+
+    .. code-block:: console
+
+       vmware_vcenter_host_password: "admin"
+
 Options for Neutron NSX-V support:
 
 .. code-block:: console
 
     vmware_nsxv_user: "nsx_manager_user"
-    vmware_nsxv_password: "nsx_manager_password"
     vmware_nsxv_manager_uri: "https://127.0.0.1"
     vmware_nsxv_cluster_moid: "TestCluster"
     vmware_nsxv_datacenter_moid: "TestDataCeter"
@@ -174,7 +180,6 @@ Options for Neutron NSX-V support:
     vmware_nsxv_metadata_initializer: "false"
     vmware_nsxv_edge_ha: "false"
 
-
 .. note::
 
     If you want to set secure connections to VMware, set ``vmware_vcenter_insecure``
@@ -182,6 +187,13 @@ Options for Neutron NSX-V support:
     Secure connections to vCenter requires a CA file, copy the vCenter CA file to
     ``/etc/kolla/config/vmware_ca``.
 
+.. note::
+
+     The VMware NSX-V password has to be set in ``/etc/kolla/passwords.yml``.
+
+     .. code-block:: console
+
+        vmware_nsxv_password: "nsx_manager_password"
 
 Then you should start kolla-ansible deployment normally as KVM/QEMU deployment.
 
@@ -239,10 +251,17 @@ Options for Neutron NSX-DVS support:
     vmware_dvs_host_ip: "192.168.1.1"
     vmware_dvs_host_port: "443"
     vmware_dvs_host_username: "admin"
-    vmware_dvs_host_password: "password"
     vmware_dvs_dvs_name: "VDS-1"
     vmware_dvs_dhcp_override_mac: ""
 
+.. note::
+
+     The VMware NSX-DVS password has to be set in ``/etc/kolla/passwords.yml``.
+
+     .. code-block:: console
+
+        vmware_dvs_host_password: "password"
+
 Then you should start kolla-ansible deployment normally as KVM/QEMU deployment.
 
 For more information on OpenStack vSphere, see
diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml
index f376e31f09..1b659da29d 100644
--- a/etc/kolla/passwords.yml
+++ b/etc/kolla/passwords.yml
@@ -27,6 +27,13 @@ docker_registry_password:
 ######################
 opendaylight_password:
 
+####################
+# VMware support
+####################
+vmware_dvs_host_password:
+vmware_nsxv_password:
+vmware_vcenter_host_password:
+
 ####################
 # OpenStack options
 ####################
diff --git a/releasenotes/notes/move-vmware-password-parameters-to-passwords-yml-b6a375e0eb8cf27f.yaml b/releasenotes/notes/move-vmware-password-parameters-to-passwords-yml-b6a375e0eb8cf27f.yaml
new file mode 100644
index 0000000000..f7e3c355b6
--- /dev/null
+++ b/releasenotes/notes/move-vmware-password-parameters-to-passwords-yml-b6a375e0eb8cf27f.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The vmware_dvs_host_password, vmware_nsxv_password, and vmware_vcenter_host_password
+    parameters moved to the passwords.yml file.