Merge "Move vmware password parameters to passwords.yml"

This commit is contained in:
Jenkins 2017-10-10 09:05:06 +00:00 committed by Gerrit Code Review
commit 8e2e437e6c
5 changed files with 38 additions and 10 deletions

View File

@ -655,12 +655,11 @@ ceph_cache_rule: "cache host firstn"
ceph_pool_pg_num: 128 ceph_pool_pg_num: 128
ceph_pool_pgp_num: 128 ceph_pool_pgp_num: 128
################################################ #####################
# VMware - OpenStack VMware support # VMware support
################################################ ######################
vmware_vcenter_host_ip: "127.0.0.1" vmware_vcenter_host_ip: "127.0.0.1"
vmware_vcenter_host_username: "username" vmware_vcenter_host_username: "username"
vmware_vcenter_host_password: "password"
vmware_vcenter_cluster_name: "cluster-1" vmware_vcenter_cluster_name: "cluster-1"
vmware_vcenter_insecure: "True" vmware_vcenter_insecure: "True"

View File

@ -282,7 +282,6 @@ neutron_agent_extensions: "{{ agent_extensions | selectattr('enabled', 'equalto'
# VMware NSXV # VMware NSXV
#################### ####################
vmware_nsxv_user: "nsx_manager_user" vmware_nsxv_user: "nsx_manager_user"
vmware_nsxv_password: "nsx_manager_password"
vmware_nsxv_manager_uri: "https://127.0.0.1" vmware_nsxv_manager_uri: "https://127.0.0.1"
vmware_nsxv_insecure: "True" vmware_nsxv_insecure: "True"
vmware_nsxv_cluster_moid: "TestCluster" vmware_nsxv_cluster_moid: "TestCluster"
@ -303,7 +302,6 @@ vmware_nsxv_edge_ha: "false"
vmware_dvs_host_ip: "192.168.1.1" vmware_dvs_host_ip: "192.168.1.1"
vmware_dvs_host_port: "443" vmware_dvs_host_port: "443"
vmware_dvs_host_username: "admin" vmware_dvs_host_username: "admin"
vmware_dvs_host_password: "password"
vmware_dvs_insecure: "True" vmware_dvs_insecure: "True"
vmware_dvs_dvs_name: "VDS-1" vmware_dvs_dvs_name: "VDS-1"
vmware_dvs_dhcp_override_mac: "" vmware_dvs_dhcp_override_mac: ""

View File

@ -150,17 +150,23 @@ Options for nova-compute and ceilometer:
vmware_vcenter_host_ip: "127.0.0.1" vmware_vcenter_host_ip: "127.0.0.1"
vmware_vcenter_host_username: "admin" vmware_vcenter_host_username: "admin"
vmware_vcenter_host_password: "admin"
vmware_vcenter_cluster_name: "cluster-1" vmware_vcenter_cluster_name: "cluster-1"
vmware_vcenter_insecure: "True" vmware_vcenter_insecure: "True"
vmware_vcenter_datastore_regex: ".*" 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: Options for Neutron NSX-V support:
.. code-block:: console .. code-block:: console
vmware_nsxv_user: "nsx_manager_user" vmware_nsxv_user: "nsx_manager_user"
vmware_nsxv_password: "nsx_manager_password"
vmware_nsxv_manager_uri: "https://127.0.0.1" vmware_nsxv_manager_uri: "https://127.0.0.1"
vmware_nsxv_cluster_moid: "TestCluster" vmware_nsxv_cluster_moid: "TestCluster"
vmware_nsxv_datacenter_moid: "TestDataCeter" vmware_nsxv_datacenter_moid: "TestDataCeter"
@ -174,7 +180,6 @@ Options for Neutron NSX-V support:
vmware_nsxv_metadata_initializer: "false" vmware_nsxv_metadata_initializer: "false"
vmware_nsxv_edge_ha: "false" vmware_nsxv_edge_ha: "false"
.. note:: .. note::
If you want to set secure connections to VMware, set ``vmware_vcenter_insecure`` 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 Secure connections to vCenter requires a CA file, copy the vCenter CA file to
``/etc/kolla/config/vmware_ca``. ``/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. 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_ip: "192.168.1.1"
vmware_dvs_host_port: "443" vmware_dvs_host_port: "443"
vmware_dvs_host_username: "admin" vmware_dvs_host_username: "admin"
vmware_dvs_host_password: "password"
vmware_dvs_dvs_name: "VDS-1" vmware_dvs_dvs_name: "VDS-1"
vmware_dvs_dhcp_override_mac: "" 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. Then you should start kolla-ansible deployment normally as KVM/QEMU deployment.
For more information on OpenStack vSphere, see For more information on OpenStack vSphere, see

View File

@ -27,6 +27,13 @@ docker_registry_password:
###################### ######################
opendaylight_password: opendaylight_password:
####################
# VMware support
####################
vmware_dvs_host_password:
vmware_nsxv_password:
vmware_vcenter_host_password:
#################### ####################
# OpenStack options # OpenStack options
#################### ####################

View File

@ -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.