diff options
| author | Lingxian Kong <anlin.kong@gmail.com> | 2020-04-16 17:50:55 +1200 |
|---|---|---|
| committer | Lingxian Kong <anlin.kong@gmail.com> | 2020-04-26 09:56:50 +1200 |
| commit | 429c39890e3242c6a502037673943b38452c5811 (patch) | |
| tree | 1ecb67979bcb664996e6f1e1a0146b59567e8a0a /etc | |
| parent | a4057b10af44e7f21243e539dd2daad2ad61657b (diff) | |
| download | trove-429c39890e3242c6a502037673943b38452c5811.tar.gz | |
Support ip address type for instances
Include address type in getting instance response.
* Deprecate confip option network_label_regex as we don't reply on Nova
to get addresses, network names don't make any sense.
* Add 'addresses' in instance API response, keep 'ip' as is but mark
it deprecated in API doc, python-troveclient shouldn't break.
Story: 2007562
Task: 39445
Change-Id: Ia0458b5ddae8959ce29c17e444e1a51a026283cd
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/trove/trove.conf.sample | 7 | ||||
| -rw-r--r-- | etc/trove/trove.conf.test | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample index 75dffc8a..e4fdd98c 100644 --- a/etc/trove/trove.conf.sample +++ b/etc/trove/trove.conf.sample @@ -58,13 +58,6 @@ trove_auth_url = http://0.0.0.0/identity/v2.0 # Service type to use when searching catalog. #neutron_service_type = network -# Config option for showing the IP address that nova doles out -# For nova-network, set this to the appropriate network label defined in nova -# For neutron, set this to .* since users can specify custom network labels -# You can also optionally specify regex'es to match the actual IP addresses -# ip_regex (white-list) is applied before black_list_regex in the filter chain -network_label_regex = ^private$ -#network_label_regex = .* #with neutron enabled #ip_regex = ^(15.|123.) #black_list_regex = ^10.0.0. diff --git a/etc/trove/trove.conf.test b/etc/trove/trove.conf.test index 09a9bac7..92f07d7e 100644 --- a/etc/trove/trove.conf.test +++ b/etc/trove/trove.conf.test @@ -50,7 +50,6 @@ nova_compute_service_type = compute nova_service_name = Compute Service # Config option for showing the IP address that nova doles out -network_label_regex = ^private$ ip_regex = ^(15.|123.) black_list_regex = ^(10.0.0.) |