diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-04 12:13:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-04 12:13:14 +0000 |
| commit | 42b796232dfa0b5ce65c3c999dfe5177a79d401d (patch) | |
| tree | 3857404f9eabea10971f8094cd7d0b233e812eec /mcp/reclass/classes/cluster | |
| parent | 7f78e0ec812bbeb32025e469b89441909024bc03 (diff) | |
| parent | d40f28f51bd8a7c683f01db265833b17c98dcf8a (diff) | |
Merge "Pin openvswitch packages from UCA" into stable/fraser
Diffstat (limited to 'mcp/reclass/classes/cluster')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 4 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 index f6533855b..42d403999 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 @@ -256,6 +256,10 @@ parameters: 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' kernel: sysctl: net.ipv4.tcp_congestion_control: yeah diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml index 7c6ce90b7..962f5cb03 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml @@ -104,6 +104,10 @@ parameters: 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' kernel: sysctl: net.ipv4.tcp_congestion_control: yeah |