diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-30 22:06:23 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-30 22:16:33 +0200 |
| commit | d4a32a5737af8f30213075178b3f66a98f7257b1 (patch) | |
| tree | 43fe9b5be4f1766e3032bb8e442035fc87d30fb3 /patches/opnfv-fuel/0020-baremetal-odl-drop-UCA-repo.patch | |
| parent | d07736d25fa29b1b45e00750568959bc00a2ee09 (diff) | |
u/fuel: Bump & rebase for salt scripts new repo
While at it, drop patch that removes UCA repo in ODL scenario
and replace it with a patch that extends arch list for UCA repo
for arm64.
JIRA: ARMBAND-304
Change-Id: Icd8e4cf8288c3e42915244f40d261ff463f60452
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0020-baremetal-odl-drop-UCA-repo.patch')
| -rw-r--r-- | patches/opnfv-fuel/0020-baremetal-odl-drop-UCA-repo.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/patches/opnfv-fuel/0020-baremetal-odl-drop-UCA-repo.patch b/patches/opnfv-fuel/0020-baremetal-odl-drop-UCA-repo.patch deleted file mode 100644 index 93319732..00000000 --- a/patches/opnfv-fuel/0020-baremetal-odl-drop-UCA-repo.patch +++ /dev/null @@ -1,34 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Fri, 25 Aug 2017 03:23:34 +0200 -Subject: [PATCH] baremetal: odl: drop UCA repo - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - .../classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml -index ea95680..60e0077 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml -@@ -198,12 +198,6 @@ parameters: - #billometer_identity_token: ${_param:keystone_service_token} - linux: - system: -- repo: -- uca: -- source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" -- architectures: amd64 -- key_id: EC4926EA -- key_server: keyserver.ubuntu.com - kernel: - sysctl: - net.ipv4.tcp_congestion_control: yeah |