diff --git a/etc/network/interfaces.d/openstack_interface.cfg.example b/etc/network/interfaces.d/openstack_interface.cfg.example index 758519c3ea..36be06e9bd 100644 --- a/etc/network/interfaces.d/openstack_interface.cfg.example +++ b/etc/network/interfaces.d/openstack_interface.cfg.example @@ -121,16 +121,3 @@ iface br-storage inet static address 172.29.244.100 netmask 255.255.252.0 - -# Bridge for servicenet network -# ALL nodes will have an IP on this bridge. If fact, it's the same IP. -# !! DO NOT PUT A PHYSICAL INTERFACE IN THIS BRIDGE ON THE HOST !! -# Will use an iptables MASQUERADE rule to NAT traffic. -auto br-snet -iface br-snet inet static - bridge_stp off - bridge_waitport 0 - bridge_fd 0 - # Notice there is NO physical interface in this bridge! - address 172.29.248.1 - netmask 255.255.252.0 diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example index 86d841f7c7..28635adf70 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.example +++ b/etc/openstack_deploy/openstack_user_config.yml.example @@ -263,27 +263,6 @@ # type: "flat" # net_name: "flat" # -# Example: -# -# Add the service network to the previous example: -# -# - Network of type 'raw' that uses the 'br-snet' bridge and 'snet' IP -# address pool. Maps to the 'eth3' device in containers. Applies to -# glance, nova compute, neutron agent containers, and any of these -# services on bare metal hosts. -# -# provider_networks: -# - network: -# group_binds: -# - glance_api -# - nova_compute -# - neutron_linuxbridge_agent -# type: "raw" -# container_bridge: "br-snet" -# container_type: "veth" -# container_interface: "eth3" -# ip_from_q: "snet" -# # -------- # # Level: shared-infra_hosts (required)