You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2020/09/18 08:51:25 UTC

[cloudstack-documentation] 01/01: Revert "remove blacklist and whitelist phrases (#137)"

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch revert-137-review_phrasing
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git

commit 21f443de47281dcdb0b1f264176f73ff65bcc942
Author: dahn <da...@gmail.com>
AuthorDate: Fri Sep 18 10:51:19 2020 +0200

    Revert "remove blacklist and whitelist phrases (#137)"
    
    This reverts commit 13e1f5db2bcae79bfd0bf31ed7658777df2be98c.
---
 source/adminguide/networking/virtual_private_cloud_config.rst | 6 +++---
 source/adminguide/virtual_machines.rst                        | 2 +-
 source/installguide/configuration.rst                         | 2 +-
 source/installguide/hypervisor/kvm.rst                        | 8 ++++----
 source/plugins/ovs-plugin.rst                                 | 5 ++---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/source/adminguide/networking/virtual_private_cloud_config.rst b/source/adminguide/networking/virtual_private_cloud_config.rst
index 3e69266..75042b2 100644
--- a/source/adminguide/networking/virtual_private_cloud_config.rst
+++ b/source/adminguide/networking/virtual_private_cloud_config.rst
@@ -648,16 +648,16 @@ to be routed back to the gateway.
    Wait for few seconds until the new route is created.
 
 
-Deny Listing Routes
+Blacklisting Routes
 ^^^^^^^^^^^^^^^^^^^
 
 CloudStack enables you to block a list of routes so that they are not
 assigned to any of the VPC private gateways. Specify the list of routes
-that you want to deny in the ``denylisted.routes`` global
+that you want to blacklist in the ``blacklisted.routes`` global
 parameter. Note that the parameter update affects only new static route
 creations. If you block an existing static route, it remains intact and
 continue functioning. You cannot add a static route if the route is
-denied for the zone.
+blacklisted for the zone.
 
 
 Deploying VMs to the Tier
diff --git a/source/adminguide/virtual_machines.rst b/source/adminguide/virtual_machines.rst
index 46c449a..fd1bd1a 100644
--- a/source/adminguide/virtual_machines.rst
+++ b/source/adminguide/virtual_machines.rst
@@ -750,7 +750,7 @@ Advanced VM Instance Settings
 Each user VM has a set of "details" associated with it (as visible via listVirtualMachine API call) - those "details" are shown on the "Settings" tab of the VM in the GUI (words "setting(s)" and "detail(s)" are here used interchangeably). 
 
 The Settings tab is always present/visible, but settings can be changed only when the VM is in a Stopped state. 
-Some VM details/settings can be hidden via "user.vm.denylisted.details" global setting (you can find below the list of those hidden by default).
+Some VM details/settings can be hidden via "user.vm.blacklisted.details" global setting (you can find below the list of those hidden by default).
 
 When adding a new setting or modifying the existing ones, setting names are shown/offered in a drop-down list, as well as their possible values (with the exception of boolean or numerical values).
 
diff --git a/source/installguide/configuration.rst b/source/installguide/configuration.rst
index 9e07879..86cff2a 100644
--- a/source/installguide/configuration.rst
+++ b/source/installguide/configuration.rst
@@ -1623,7 +1623,7 @@ zone      router.template.kvm                                        Name of the
 zone      router.template.vmware                                     Name of the default router template on VMware.
 zone      enable.dynamic.scale.vm                                    Enable or diable dynamically scaling of a VM.
 zone      use.external.dns                                           Bypass internal DNS, and use the external DNS1 and DNS2
-zone      denylisted.routes                                          Routes that are deny-listed cannot be used for creating static routes for a VPC Private Gateway.
+zone      blacklisted.routes                                         Routes that are blacklisted cannot be used for creating static routes for a VPC Private Gateway.
 ========  =========================================================  ======================================================================================================================================  
 
 
diff --git a/source/installguide/hypervisor/kvm.rst b/source/installguide/hypervisor/kvm.rst
index 371737e..bb1756a 100644
--- a/source/installguide/hypervisor/kvm.rst
+++ b/source/installguide/hypervisor/kvm.rst
@@ -833,10 +833,10 @@ Preparing
 ^^^^^^^^^
 
 To make sure that the native bridge module will not interfere with
-openvswitch the bridge module should be added to the deny list (likely named
-'blacklist') see the modprobe documentation for your distribution on 
-where to find the deny list. Make sure the module is not loaded either 
-by rebooting or executing rmmod bridge before executing next steps.
+openvswitch the bridge module should be added to the blacklist. See the
+modprobe documentation for your distribution on where to find the
+blacklist. Make sure the module is not loaded either by rebooting or
+executing rmmod bridge before executing next steps.
 
 The network configurations below depend on the ifup-ovs and ifdown-ovs
 scripts which are part of the openvswitch installation. They should be
diff --git a/source/plugins/ovs-plugin.rst b/source/plugins/ovs-plugin.rst
index 4a4232c..a570dfb 100644
--- a/source/plugins/ovs-plugin.rst
+++ b/source/plugins/ovs-plugin.rst
@@ -83,9 +83,8 @@ KVM hypervisor:
 -  CentOS 6.4 is recommended.
 
 -  To make sure that the native bridge module will not interfere with 
-   openvSwitch the bridge module should be added to the deny list. See the 
-   modprobe documentation for your distribution on where to find the deny list
-   (likely named 'blacklist'). 
+   openvSwitch the bridge module should be added to the blacklist. See the 
+   modprobe documentation for your distribution on where to find the blacklist. 
    Make sure the module is not loaded either by rebooting or executing rmmod 
    bridge before executing next steps.