diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-13 19:04:32 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-16 12:00:25 +0000 |
| commit | 85c96cb879081b3b13a6d53c50866637d09f9f42 (patch) | |
| tree | 3e6c0f3a588c163d69e90d4f8a4e7ef028a83865 /patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch | |
| parent | 8bceae7e5888f9b97bc16239a653135094fc985b (diff) | |
Rebase: p/fuel-library: nailgun -> fuel module.
Upstream introduced two related changes, requiring a rebase:
- Remove nailgun module [1]
- Remove CentOS based bootstrap image support [2]
[1] https://github.com/openstack/fuel-library/commit/
74a68f493ff215ce8dfc67c3af6d06dd5a2db194
[2] https://github.com/openstack/fuel-library/commit/
3e1320bfcf4a8688d4bfb577a1330121390bafc0
Change-Id: I27279a2fd76d269d482a3eb25e9dba41bc669280
Diffstat (limited to 'patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch')
| -rw-r--r-- | patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch b/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch index 591d3968..2edabc66 100644 --- a/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch +++ b/patches/fuel-library/0002-Add-arm64-for-auxiliary-repos.patch @@ -3,14 +3,14 @@ Date: Wed, 24 Feb 2016 20:05:25 +0100 Subject: [PATCH] Add arm64 for auxiliary repos --- - deployment/puppet/nailgun/files/Release-auxiliary | 2 +- - deployment/puppet/nailgun/manifests/auxiliaryrepos.pp | 4 +++- + deployment/puppet/fuel/files/Release-auxiliary | 2 +- + deployment/puppet/fuel/manifests/auxiliaryrepos.pp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) -diff --git a/deployment/puppet/nailgun/files/Release-auxiliary b/deployment/puppet/nailgun/files/Release-auxiliary +diff --git a/deployment/puppet/fuel/files/Release-auxiliary b/deployment/puppet/fuel/files/Release-auxiliary index 2d5ce58..03f84b8 100644 ---- a/deployment/puppet/nailgun/files/Release-auxiliary -+++ b/deployment/puppet/nailgun/files/Release-auxiliary +--- a/deployment/puppet/fuel/files/Release-auxiliary ++++ b/deployment/puppet/fuel/files/Release-auxiliary @@ -3,6 +3,6 @@ Label: auxiliary Suite: auxiliary Codename: auxiliary @@ -19,10 +19,10 @@ index 2d5ce58..03f84b8 100644 +Architectures: amd64 arm64 Components: main restricted Description: Auxiliary -diff --git a/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp b/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp +diff --git a/deployment/puppet/fuel/manifests/auxiliaryrepos.pp b/deployment/puppet/fuel/manifests/auxiliaryrepos.pp index 720943d..91adb3e 100644 ---- a/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp -+++ b/deployment/puppet/nailgun/manifests/auxiliaryrepos.pp +--- a/deployment/puppet/fuel/manifests/auxiliaryrepos.pp ++++ b/deployment/puppet/fuel/manifests/auxiliaryrepos.pp @@ -40,7 +40,9 @@ class nailgun::auxiliaryrepos( $release_files = [ "${ubuntu_dir}/dists/auxiliary/Release", |