From 44cf00ab04b53daaec6d0b28adfdc223ce7144f7 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Thu, 25 Feb 2021 14:59:40 +0100 Subject: [PATCH] don't use the same CIDR in octavia_amp_network_cidr and init-run-once Currently kolla-ansible uses the same CIDR in init-run-once script and for octavia_amp_network_cidr. Change-Id: I5ab24fbf9be4acbd691f13d33908aa44d2b4d496 --- ansible/roles/octavia/defaults/main.yml | 2 +- etc/kolla/globals.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/octavia/defaults/main.yml b/ansible/roles/octavia/defaults/main.yml index e04b2eb0a6..5502c2b807 100644 --- a/ansible/roles/octavia/defaults/main.yml +++ b/ansible/roles/octavia/defaults/main.yml @@ -240,4 +240,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 diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 04b1655f1b..d010285781 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -785,7 +785,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"