diff --git a/defaults/main.yml b/defaults/main.yml index 85fa739..c75d67e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -179,11 +179,11 @@ trove_service_net_type: flat trove_service_net_name: dbaas_service_net # Network segmentation ID if vlan, gre... # trove_service_net_segmentation_id: -trove_service_subnet_name: dbaas_service_subnet -trove_service_net_subnet_cidr: "192.168.20.0/24" +trove_service_subnet_name: dbaas_subnet +trove_service_net_subnet_cidr: "172.29.252.0/22" trove_service_net_dhcp: "True" -trove_service_net_allocation_pool_start: "192.168.20.100" -trove_service_net_allocation_pool_end: "192.168.20.120" +trove_service_net_allocation_pool_start: "172.29.252.110" +trove_service_net_allocation_pool_end: "172.29.255.254" trove_service_net_endpoint_type: internal # RPC encryption keys diff --git a/doc/source/configure-trove.rst b/doc/source/configure-trove.rst index cb04634..2071b5c 100644 --- a/doc/source/configure-trove.rst +++ b/doc/source/configure-trove.rst @@ -39,14 +39,15 @@ An example entry into ``openstack_user_config.yml`` is shown below: - network: container_bridge: "br-dbaas" container_type: "veth" - container_interface: "eth14" - host_bind_override: "eth14" + container_interface: "eth13" + host_bind_override: "eth13" ip_from_q: "dbaas" type: "flat" net_name: "dbaas-mgmt" group_binds: - neutron_linuxbridge_agent - oslomsg_rpc + - trove_all Make sure to modify the other entries in this file as well. @@ -71,9 +72,9 @@ manually, if so desired: --provider:network_type flat \ --provider:physical_network dbaas-mgmt - neutron subnet-create dbaas_service_net 172.19.0.0/22 --name dbaas_service_subnet + neutron subnet-create dbaas_service_net 172.29.252.0/22 --name dbaas_service_subnet --ip-version=4 \ - --allocation-pool start=172.19.1.100,end=172.19.1.200 \ + --allocation-pool start=172.29.252.110,end=172.29.255.255 \ --enable-dhcp \ --dns-nameservers list=true 8.8.4.4 8.8.8.8 diff --git a/releasenotes/notes/trove_service_subnet-011acf408754f6d9.yaml b/releasenotes/notes/trove_service_subnet-011acf408754f6d9.yaml new file mode 100644 index 0000000..747540d --- /dev/null +++ b/releasenotes/notes/trove_service_subnet-011acf408754f6d9.yaml @@ -0,0 +1,10 @@ +--- +upgrade: + - | + Default value for ``trove_service_net_subnet_cidr`` has been changed from + "192.168.20.0/24" to "172.29.252.0/22". Along with that pool start and + pool end has changed as well, which is represented with variables + ``trove_service_net_allocation_pool_start`` and + ``trove_service_net_allocation_pool_end``. + Please, define these variables user_variables in case you used default + values in production endironments.