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

ansible/roles/octavia/defaults/main.yml

@@ -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

etc/kolla/globals.yml

@@ -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"