search

jonasbjurel / OPNFV-Playground

Playground for OPNFV
Apache License 2.0
3 stars 2 forks source link

Adaptation of the deploy phase to Fuel 6.1 #43

Closed consultron closed 9 years ago

consultron commented 9 years ago

The structure for dea.yaml and dha.yaml files in the config directory has been changed so that multiple Fuel versions can be supported.

The ci_pipeline.sh will use the Fuel major version (as found in the ISO under version.yaml) to find the appropriate deploy config to use. By default this will be the ones found under:

config/<Fuel version (for example 6.1)>/default_no_ha/

The deploy target can be changed either by applying the "-a" flag (which has a new meaning) or setting the environment variable $DEPLOYTGT. As an example, to deploy with dea.yaml parameters valid for an ELX installation the target "elx_no_ha" can be set and the files used will thus be those under:

config/<Fuel version (for example 6.1)>/elx_no_ha/

In order to easily extract the version.yaml file, a new package dependency has been added to install.sh: p7zip-full

The instructions in install.sh has also been updated so that the name of the libvirtd service matches that of Ubuntu 14.04, which is "libvirt-bin" and not "libvirtd".

Signed-off-by: Stefan Berg sfb@consultron.com

consultron commented 9 years ago

Ah, yes, and moved the enabling of the signal trap down a bit so we can get the help text only without it firing. :)

jonasbjurel commented 9 years ago

Great job Stefan, I want to merge as soon as you had a look at my two inline comments. -1

consultron commented 9 years ago

Hm, what was your second inline comment - I can't find that one, sorry!

consultron commented 9 years ago

Fixed qemu -> kvm for all dea.yaml, missed that one before. Done now!

jonasbjurel commented 9 years ago

My second comment was about the libvirt service name. I must have missed to save that. My service name for libvirt was earlier libvirtd (also with 14.04) So it might have changed for elx-only or with a Ubuntu 14.04 service release. We might want to state both these alternatives in the install.sh post action needed.

consultron commented 9 years ago

On libvirt-bin/libvirtd: Right now libvirt-bin seems to be the safest bet, but I also seem to recall that libvirtd has been the service name before - let's look into to it, I'm writing an issue for my lousy memory.

Best solution is probably to simply check which service name is the right one in the install.sh logic and present that in the instructions. :)