diff options
| author |   Carlos Goncalves <carlos.goncalves@neclab.eu> | 2016-08-01 12:03:02 +0200 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2016-08-03 10:25:17 -0400 |
| commit | 2e9b552d5efe383ce08ff48a9739031f28251013 (patch) | |
| tree | 176a2624d7dad402d84832633811190b55669d14 /build/Makefile | |
| parent | 31b10ea2994fc4d6614c0a31b0f54dbd58dc7abc (diff) | |
Build Congress RPM package
Changes include:
- RPM build for congress moved into Apex
- Fixes missing log dir for congress in spec
- Adds missing API network definition for Congress
- Fixes URL for getting doctor driver
- Increases controller default RAM to 10GB due to resource contention
with ODL
- Fixes Congress service config/db sync in THT to be in step 3
opnfv-tht-pr: 51
JIRA: APEX-212
Change-Id: I4a55646e7ef851782ae0d1963f7b479086958365
Signed-off-by: Carlos Goncalves <carlos.goncalves@neclab.eu>
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/Makefile')
| -rw-r--r-- | build/Makefile | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/build/Makefile b/build/Makefile index a1089a84..96711d23 100644 --- a/build/Makefile +++ b/build/Makefile @@ -27,7 +27,7 @@ all_networks="admin_network private_network storage_network external_network api all: iso .PHONY: clean -clean: images-clean rpms-clean iso-clean tacker-clean +clean: images-clean rpms-clean iso-clean tacker-clean congress-clean .PHONY: images images: undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc @@ -107,6 +107,29 @@ openstack-tacker-2015.2-1.noarch.rpm: rpmbuild --clean -bb --target noarch openstack-tacker.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`)' ############### +# CONGRESS # +############### + +.PHONY: congress-clean + +congress-clean: + @rm -rf openstack-congress-2016.1 + @rm -f openstack-congress.tar.gz + +openstack-congress.tar.gz: + @echo "Preparing the Congress RPM prerequisites" + git clone http://github.com/openstack/congress -b stable/mitaka openstack-congress-2016.1 + cd openstack-congress-2016.1 && curl -O https://radez.fedorapeople.org/openstack-congress.service + tar czf openstack-congress.tar.gz openstack-congress-2016.1 + +.PHONY: congress-rpm +congress-rpm: openstack-congress.tar.gz openstack-congress-2016.1-1.noarch.rpm + +openstack-congress-2016.1-1.noarch.rpm: + @echo "Building the Congress RPM" + rpmbuild --clean -bb --target noarch openstack-congress.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`)' + +############### # UNDERCLOUD # ############### @@ -151,7 +174,7 @@ overcloud-full-clean: .PHONY: overcloud-full overcloud-full: images/overcloud-full.qcow2 -images/overcloud-full.qcow2: tacker-rpm +images/overcloud-full.qcow2: tacker-rpm congress-rpm @echo "Building the Apex Base Overcloud Image" @./overcloud-full.sh |