Merge "don't use the same CIDR in octavia_amp_network_cidr and init-run-once"

This commit is contained in:
Zuul
2021-03-17 16:31:28 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -301,4 +301,4 @@ octavia_amp_network:
enable_dhcp: yes
# Octavia management network subnet CIDR.
octavia_amp_network_cidr: 10.0.0.0/24
octavia_amp_network_cidr: 10.1.0.0/24

View File

@@ -789,7 +789,7 @@
# enable_dhcp: yes
# Octavia management network subnet CIDR.
#octavia_amp_network_cidr: 10.0.0.0/24
#octavia_amp_network_cidr: 10.1.0.0/24
#octavia_amp_image_tag: "amphora"