diff options
| -rw-r--r-- | environments/network-isolation.yaml | 3 | ||||
| -rw-r--r-- | network/config/bond-with-vlans/ceph-storage.yaml | 10 | ||||
| -rw-r--r-- | network/config/bond-with-vlans/cinder-storage.yaml | 10 | ||||
| -rw-r--r-- | network/config/bond-with-vlans/compute.yaml | 10 | ||||
| -rw-r--r-- | network/config/bond-with-vlans/controller.yaml | 22 | ||||
| -rw-r--r-- | network/config/bond-with-vlans/swift-storage.yaml | 10 | ||||
| -rw-r--r-- | network/config/single-nic-vlans/controller.yaml | 8 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 10 |
8 files changed, 31 insertions, 52 deletions
diff --git a/environments/network-isolation.yaml b/environments/network-isolation.yaml index 5eb2b2da..937931d1 100644 --- a/environments/network-isolation.yaml +++ b/environments/network-isolation.yaml @@ -33,3 +33,6 @@ resource_registry: OS::TripleO::BlockStorage::Ports::InternalApiPort: ../network/ports/internal_api.yaml OS::TripleO::BlockStorage::Ports::StoragePort: ../network/ports/storage.yaml OS::TripleO::BlockStorage::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml + + # Port assignments for service virtual IPs for the controller role + OS::TripleO::Controller::Ports::RedisVipPort: ../network/ports/vip.yaml diff --git a/network/config/bond-with-vlans/ceph-storage.yaml b/network/config/bond-with-vlans/ceph-storage.yaml index ed9fff7a..cd70cbef 100644 --- a/network/config/bond-with-vlans/ceph-storage.yaml +++ b/network/config/bond-with-vlans/ceph-storage.yaml @@ -50,16 +50,6 @@ resources: network_config: - type: ovs_bridge - name: br-storage - use_dhcp: true - members: - - - type: interface - name: nic1 - # force the MAC address of the bridge to this interface - primary: true - - - type: ovs_bridge name: br-bond members: - diff --git a/network/config/bond-with-vlans/cinder-storage.yaml b/network/config/bond-with-vlans/cinder-storage.yaml index 95733fca..866112cb 100644 --- a/network/config/bond-with-vlans/cinder-storage.yaml +++ b/network/config/bond-with-vlans/cinder-storage.yaml @@ -53,16 +53,6 @@ resources: network_config: - type: ovs_bridge - name: br-storage - use_dhcp: true - members: - - - type: interface - name: nic1 - # force the MAC address of the bridge to this interface - primary: true - - - type: ovs_bridge name: br-bond members: - diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml index 709b3b5b..5105ee14 100644 --- a/network/config/bond-with-vlans/compute.yaml +++ b/network/config/bond-with-vlans/compute.yaml @@ -53,16 +53,6 @@ resources: network_config: - type: ovs_bridge - name: {get_input: bridge_name} - use_dhcp: true - members: - - - type: interface - name: nic1 - # force the MAC address of the bridge to this interface - primary: true - - - type: ovs_bridge name: br-bond members: - diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml index 16a0dec2..9d6a6810 100644 --- a/network/config/bond-with-vlans/controller.yaml +++ b/network/config/bond-with-vlans/controller.yaml @@ -50,6 +50,10 @@ parameters: default: 50 description: Vlan ID for the tenant network traffic. type: number + ExternalInterfaceDefaultRoute: + default: '10.0.0.1' + description: default route for the external network + type: string resources: OsNetConfigImpl: @@ -62,16 +66,6 @@ resources: - type: ovs_bridge name: {get_input: bridge_name} - use_dhcp: true - members: - - - type: interface - name: nic1 - # force the MAC address of the bridge to this interface - primary: true - - - type: ovs_bridge - name: br-bond members: - type: ovs_bond @@ -90,8 +84,12 @@ resources: device: bond1 vlan_id: {get_param: ExternalNetworkVlanID} addresses: - - - ip_netmask: {get_param: ExternalIpSubnet} + - + ip_netmask: {get_param: ExternalIpSubnet} + routes: + - + ip_netmask: 0.0.0.0/0 + next_hop: {get_param: ExternalInterfaceDefaultRoute} - type: vlan device: bond1 diff --git a/network/config/bond-with-vlans/swift-storage.yaml b/network/config/bond-with-vlans/swift-storage.yaml index 6549ce7a..f31ed0e7 100644 --- a/network/config/bond-with-vlans/swift-storage.yaml +++ b/network/config/bond-with-vlans/swift-storage.yaml @@ -53,16 +53,6 @@ resources: network_config: - type: ovs_bridge - name: br-storage - use_dhcp: true - members: - - - type: interface - name: nic1 - # force the MAC address of the bridge to this interface - primary: true - - - type: ovs_bridge name: br-bond members: - diff --git a/network/config/single-nic-vlans/controller.yaml b/network/config/single-nic-vlans/controller.yaml index ca0cbcad..4cfa1317 100644 --- a/network/config/single-nic-vlans/controller.yaml +++ b/network/config/single-nic-vlans/controller.yaml @@ -45,6 +45,10 @@ parameters: default: 50 description: Vlan ID for the tenant network traffic. type: number + ExternalInterfaceDefaultRoute: + default: '10.0.0.1' + description: default route for the external network + type: string resources: OsNetConfigImpl: @@ -70,6 +74,10 @@ resources: addresses: - ip_netmask: {get_param: ExternalIpSubnet} + routes: + - + ip_netmask: 0.0.0.0/0 + next_hop: {get_param: ExternalInterfaceDefaultRoute} - type: vlan vlan_id: {get_param: InternalApiNetworkVlanID} diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index ea1671a5..429d3f39 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -850,6 +850,16 @@ if hiera('step') >= 4 { } # Neutron + # NOTE(gfidente): Neutron will try to populate the database with some data + # as soon as neutron-server is started; to avoid races we want to make this + # happen only on one node, before normal Pacemaker initialization + # https://bugzilla.redhat.com/show_bug.cgi?id=1233061 + exec { 'neutron-server-start-wait-stop' : + command => "systemctl start neutron-server && \ + sleep 5s && \ + systemctl stop neutron-server", + path => ["/usr/bin", "/usr/sbin"], + } -> pacemaker::resource::service { $::neutron::params::server_service: op_params => "start timeout=90", clone_params => "interleave=true", |