diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 2 | ||||
| -rw-r--r-- | build/opnfv-environment.yaml | 5 | ||||
| -rwxr-xr-x | build/undercloud.sh | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/build/Makefile b/build/Makefile index e7def26f..3746fab5 100644 --- a/build/Makefile +++ b/build/Makefile @@ -12,7 +12,7 @@ export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.2.1511/isos/x86_64/CentOS- export CENTISO = $(shell pwd)/$(shell basename $(CENTDNLD)) export RELEASE = "0" export ISO = $(shell pwd)/release/OPNFV-CentOS-7-x86_64-${RELEASE}.iso -export RPMVERS = $(shell grep Version $(shell pwd)/opnfv-apex.spec | awk '{ print $$2 }') +export RPMVERS = $(shell grep Version $(shell pwd)/opnfv-apex.spec | head -n 1 | awk '{ print $$2 }') export RPMCOM = $(shell pwd)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMUDR = $(shell pwd)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMODL = $(shell pwd)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml new file mode 100644 index 00000000..127a7283 --- /dev/null +++ b/build/opnfv-environment.yaml @@ -0,0 +1,5 @@ +#Environment file used to list common parameters required for all deployment +#types + +parameters: + controllerImage: overcloud-full diff --git a/build/undercloud.sh b/build/undercloud.sh index 02ff3ff6..f39ee73f 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -27,6 +27,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "curl http://download.opensuse.org/repositories/Openwsman/CentOS_CentOS-7/Openwsman.repo > /etc/yum.repos.d/wsman.repo" \ --run-command "yum update -y openwsman*" \ --run-command "cp /usr/share/instack-undercloud/undercloud.conf.sample /home/stack/undercloud.conf && chown stack:stack /home/stack/undercloud.conf" \ + --upload ../opnfv-environment.yaml:/home/stack/ \ -a undercloud.qcow2 # Patch in OpenDaylight installation and configuration @@ -34,3 +35,4 @@ LIBGUESTFS_BACKEND=direct virt-customize \ # --run-command "cd /usr/share/openstack-tripleo-heat-templates/ && patch -Np1 < /tmp/opnfv-tripleo-heat-templates.patch" \ # -a undercloud.qcow2 popd > /dev/null + |