Skip to content

Commit 0a4edbe

Browse files
authored
Revert "remove blacklist and whitelist phrases (apache#137)" (apache#154)
This reverts commit 13e1f5d.
1 parent 13e1f5d commit 0a4edbe

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

source/adminguide/networking/virtual_private_cloud_config.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -648,16 +648,16 @@ to be routed back to the gateway.
648648
Wait for few seconds until the new route is created.
649649

650650

651-
Deny Listing Routes
651+
Blacklisting Routes
652652
^^^^^^^^^^^^^^^^^^^
653653

654654
CloudStack enables you to block a list of routes so that they are not
655655
assigned to any of the VPC private gateways. Specify the list of routes
656-
that you want to deny in the ``denylisted.routes`` global
656+
that you want to blacklist in the ``blacklisted.routes`` global
657657
parameter. Note that the parameter update affects only new static route
658658
creations. If you block an existing static route, it remains intact and
659659
continue functioning. You cannot add a static route if the route is
660-
denied for the zone.
660+
blacklisted for the zone.
661661

662662

663663
Deploying VMs to the Tier

source/adminguide/virtual_machines.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ Advanced VM Instance Settings
750750
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).
751751

752752
The Settings tab is always present/visible, but settings can be changed only when the VM is in a Stopped state.
753-
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).
753+
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).
754754

755755
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).
756756

source/installguide/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,7 @@ zone router.template.kvm Name of the
16231623
zone router.template.vmware Name of the default router template on VMware.
16241624
zone enable.dynamic.scale.vm Enable or diable dynamically scaling of a VM.
16251625
zone use.external.dns Bypass internal DNS, and use the external DNS1 and DNS2
1626-
zone denylisted.routes Routes that are deny-listed cannot be used for creating static routes for a VPC Private Gateway.
1626+
zone blacklisted.routes Routes that are blacklisted cannot be used for creating static routes for a VPC Private Gateway.
16271627
======== ========================================================= ======================================================================================================================================
16281628

16291629

source/installguide/hypervisor/kvm.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -833,10 +833,10 @@ Preparing
833833
^^^^^^^^^
834834

835835
To make sure that the native bridge module will not interfere with
836-
openvswitch the bridge module should be added to the deny list (likely named
837-
'blacklist') see the modprobe documentation for your distribution on
838-
where to find the deny list. Make sure the module is not loaded either
839-
by rebooting or executing rmmod bridge before executing next steps.
836+
openvswitch the bridge module should be added to the blacklist. See the
837+
modprobe documentation for your distribution on where to find the
838+
blacklist. Make sure the module is not loaded either by rebooting or
839+
executing rmmod bridge before executing next steps.
840840

841841
The network configurations below depend on the ifup-ovs and ifdown-ovs
842842
scripts which are part of the openvswitch installation. They should be

source/plugins/ovs-plugin.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,8 @@ KVM hypervisor:
8383
- CentOS 6.4 is recommended.
8484

8585
- To make sure that the native bridge module will not interfere with
86-
openvSwitch the bridge module should be added to the deny list. See the
87-
modprobe documentation for your distribution on where to find the deny list
88-
(likely named 'blacklist').
86+
openvSwitch the bridge module should be added to the blacklist. See the
87+
modprobe documentation for your distribution on where to find the blacklist.
8988
Make sure the module is not loaded either by rebooting or executing rmmod
9089
bridge before executing next steps.
9190

0 commit comments

Comments
 (0)