diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 20:18:25 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 20:59:53 +0200 |
commit | 48bc9269c4f452ae184238e0aae37c319e6f7040 (patch) | |
tree | 75f5b3c99916694bc6f15c08c8dc7e24226c343b /patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch | |
parent | 4ab28df9437c18a5a08fd774322df34a68a409d0 (diff) |
Rebase: Sync after Build system uplift to Fuel 9.0
Refresh patches after Fuel@OPNFV migrated to Mitaka in [1],
"Build system uplift to Fuel 9.0/Mitaka".
>As bootstrap_admin_node.sh has
>been transitioned into an RPM (fuel-support), the lazy designer found
>it more simple to patch that script during the Fuel build phase than
>at the OPNFV ISO generation. The patch mechanism has been changed to
>a normal context diff instead of the orig/modified file tuples
>previously used. Hopefully this will require fewer manual rebases
>(may the fuzz be with us!).
>Also the ks.cfg patching has transitioned to a context based ordinary
>patch for the same reasons, but this is as before taking place during
>OPNFV ISO generation.
[1] https://gerrit.opnfv.org/gerrit/#/c/13919/
Diffstat (limited to 'patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch')
-rw-r--r-- | patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch index 568f6602..cf962502 100644 --- a/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch +++ b/patches/opnfv-fuel/0001-Allow-customizing-Fuel-commit.patch @@ -14,8 +14,8 @@ index 667575c..30d9ccc 100644 ############################################################################## FUEL_MAIN_REPO := https://github.com/openstack/fuel-main --FUEL_MAIN_TAG = stable/8.0 -+FUEL_MAIN_TAG := stable/8.0 - MOS_VERSION = 8.0 - OPENSTACK_VERSION = liberty-8.0 +-FUEL_MAIN_TAG = 9.0 ++FUEL_MAIN_TAG := 9.0 + MOS_VERSION = 9.0 + OPENSTACK_VERSION = mitaka-9.0 |