openstack
/
charm-octavia
Code Issues Proposed changes

Don't use neutron dns search domain 

If there is a neutron search domain available don't use
it since we use the Juju provider dns for the o-hm0 port.

Change-Id: I369d7708f7149e7b491c0f4a1f86126cb0707373
Related-Bug: #1845303
This commit is contained in:
Edward Hope-Morley 2020-04-24 16:26:33 +01:00 committed by David Ames
parent 167d7d9cd0
commit 9f05097984
6 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/templates/99-charm-octavia-o-hm0.network
View File

@ -14,3 +14,4 @@ DHCP=yes
UseMTU=true
UseRoutes=false
RouteMetric=100
UseDomains=route

1
src/tests/bundles/bionic-rocky-ha.yaml
View File

@ -159,6 +159,7 @@ applications:
options:
amp-image-tag: 'octavia-amphora'
retrofit-uca-pocket: rocky
retrofit-series: bionic
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1

1
src/tests/bundles/bionic-rocky-lxd.yaml
View File

@ -180,6 +180,7 @@ applications:
charm: cs:~openstack-charmers-next/octavia-diskimage-retrofit
options:
amp-image-tag: 'octavia-amphora'
retrofit-series: bionic
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1

1
src/tests/bundles/bionic-stein-ha.yaml
View File

@ -159,6 +159,7 @@ applications:
options:
amp-image-tag: 'octavia-amphora'
retrofit-uca-pocket: stein
retrofit-series: bionic
vault:
charm: cs:~openstack-charmers-next/vault
num_units: 1

1
src/tests/bundles/bionic-train-ha-ovn.yaml
View File

@ -151,6 +151,7 @@ applications:
options:
amp-image-tag: 'octavia-amphora'
retrofit-uca-pocket: train
retrofit-series: bionic
placement:
charm: cs:~openstack-charmers-next/placement
num_units: 1

1
src/tests/bundles/bionic-train-ha.yaml
View File

@ -164,6 +164,7 @@ applications:
options:
amp-image-tag: 'octavia-amphora'
retrofit-uca-pocket: train
retrofit-series: bionic
placement:
charm: cs:~openstack-charmers-next/placement
num_units: 1