diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-07-27 15:36:15 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-07-31 12:04:57 +0400 |
| commit | a9ad0da2d480a47d83cb26c03574cfdcee84b647 (patch) | |
| tree | 1d4bc69feacdf0daffef7d7be71215364a236c8f /mcp/reclass | |
| parent | bb55bb795bd8f47598a38d445e0083fb6ca96b50 (diff) | |
[ovn/noha] Simplify net scheme on compute nodes
Also install OVS 2.9 from UCA repository to get the latest code/fixes.
Change-Id: I09d6da67d28033bc0e64eef27fffb368d262d7f4
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 | 18 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml | 12 |
2 files changed, 17 insertions, 13 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 index 89ba3b074..a6b61645e 100644 --- a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/compute.yml.j2 @@ -21,9 +21,11 @@ parameters: external_interface: enabled: true name: ${_param:external_interface} - mtu: ${_param:interface_mtu} proto: manual - type: eth + ovs_port_type: OVSPort + type: ovs_port + ovs_bridge: br-floating + bridge: br-floating br-mesh: enabled: true type: bridge @@ -36,20 +38,10 @@ parameters: enabled: true type: ovs_bridge mtu: ${_param:interface_mtu} - float-to-ex: - enabled: true - type: ovs_port - mtu: ${_param:interface_mtu} - bridge: br-floating - br-ex: - enabled: true - type: bridge - mtu: ${_param:interface_mtu} + proto: static address: ${_param:external_address} netmask: ${_param:opnfv_net_public_mask} use_interfaces: - ${_param:external_interface} - use_ovs_ports: - - float-to-ex gateway: ${_param:opnfv_net_public_gw} name_servers: {{ nm.dns_public }} diff --git a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml index cba6b7741..2da6a6d10 100644 --- a/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml +++ b/mcp/reclass/classes/cluster/mcp-ovn-noha/openstack/init.yml @@ -8,3 +8,15 @@ --- classes: - cluster.mcp-common-noha.openstack_init +parameters: + linux: + system: + repo: + uca: + source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" + key_id: EC4926EA + key_server: keyserver.ubuntu.com + pin: + - pin: 'release o=Canonical' + priority: 1200 + package: 'openvswitch* python-openvswitch ovn*' |