summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 05:26:11 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 05:26:11 +0000
commita42496e68dc0f52fbbd15e1be5b55c3b3b472ab1 (patch)
tree3fe5b854757e2442e23707343a84308fc53cd65b
parent1c848cc8be8dc8753ab853d3fa01f7d86d65342b (diff)
parent7be9e623d664e680bed8e2c7edde978cdfbaa9ab (diff)
Merge "Wrong comment symbol in configuration file"
-rw-r--r--etc/trove/trove.conf.sample2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample
index 2440d96..5456de0 100644
--- a/etc/trove/trove.conf.sample
+++ b/etc/trove/trove.conf.sample
@@ -66,7 +66,7 @@ trove_auth_url = http://0.0.0.0/identity/v2.0
66# You can also optionally specify regex'es to match the actual IP addresses 66# You can also optionally specify regex'es to match the actual IP addresses
67# ip_regex (white-list) is applied before black_list_regex in the filter chain 67# ip_regex (white-list) is applied before black_list_regex in the filter chain
68network_label_regex = ^private$ 68network_label_regex = ^private$
69#network_label_regex = .* //with neutron enabled 69#network_label_regex = .* #with neutron enabled
70#ip_regex = ^(15.|123.) 70#ip_regex = ^(15.|123.)
71#black_list_regex = ^10.0.0. 71#black_list_regex = ^10.0.0.
72 72