diff options
| -rw-r--r-- | foreman/build/Makefile | 2 | ||||
| -rw-r--r-- | foreman/build/opnfv-genesis.spec | 7 | ||||
| -rw-r--r-- | fuel/deploy/libvirt/conf/ha/dea.yaml | 2 | ||||
| -rw-r--r-- | fuel/deploy/libvirt/conf/multinode/dea.yaml | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/foreman/build/Makefile b/foreman/build/Makefile index 8b87ce6..09e91d2 100644 --- a/foreman/build/Makefile +++ b/foreman/build/Makefile @@ -106,7 +106,7 @@ rpm-clean: .PHONY: rpm rpm: - pushd ../../ && git archive --format=tar --prefix=opnfv-genesis-0.1/ HEAD | gzip > foreman/build/opnfv-genesis.tar.gz + pushd ../../ && git archive --format=tar --prefix=opnfv-genesis-0.1/ origin/stable/arno | gzip > foreman/build/opnfv-genesis.tar.gz rpmbuild -ba opnfv-genesis.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' @make rpm-clean diff --git a/foreman/build/opnfv-genesis.spec b/foreman/build/opnfv-genesis.spec index 674760f..bcac1a9 100644 --- a/foreman/build/opnfv-genesis.spec +++ b/foreman/build/opnfv-genesis.spec @@ -21,11 +21,12 @@ The files from the OPNFV genesis repo %build %install -mkdir -p %{buildroot}/usr/bin/ -cp foreman/ci/deploy.sh %{buildroot}/usr/bin/ +mkdir -p %{buildroot}/root/genesis +cp -r foreman/ %{buildroot}/root/genesis +cp -r common/ %{buildroot}/root/genesis %files -/usr/bin/deploy.sh +/root/genesis %changelog diff --git a/fuel/deploy/libvirt/conf/ha/dea.yaml b/fuel/deploy/libvirt/conf/ha/dea.yaml index 907bf90..1a4939a 100644 --- a/fuel/deploy/libvirt/conf/ha/dea.yaml +++ b/fuel/deploy/libvirt/conf/ha/dea.yaml @@ -416,7 +416,7 @@ settings: libvirt_type: label: Hypervisor type type: radio - value: kvm + value: qemu values: - data: kvm description: Choose this type of hypervisor if you run OpenStack on hardware diff --git a/fuel/deploy/libvirt/conf/multinode/dea.yaml b/fuel/deploy/libvirt/conf/multinode/dea.yaml index dfd8382..fd4b64f 100644 --- a/fuel/deploy/libvirt/conf/multinode/dea.yaml +++ b/fuel/deploy/libvirt/conf/multinode/dea.yaml @@ -416,7 +416,7 @@ settings: libvirt_type: label: Hypervisor type type: radio - value: kvm + value: qemu values: - data: kvm description: Choose this type of hypervisor if you run OpenStack on hardware |