Skip to content

Commit

Permalink
prometheus changes
Browse files Browse the repository at this point in the history
  • Loading branch information
bashokba committed May 9, 2020
1 parent d29ab5b commit 7cc516e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions agent-ovs/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Build-Depends:
debhelper (>= 8.0.0), autotools-dev, libboost-all-dev (>= 1.53),
libopflex-dev, libmodelgbp-dev, libnoiro-openvswitch-dev (>= 2.12.0) <!norenderer>,
libnoiro-openvswitch (>= 2.12.0) <!norenderer>, libnetfilter-conntrack-dev (>= 1.0) <!norenderer>,
rapidjson-dev (>=1.1), pkgconf, dh-systemd, libssl-dev (>= 1.0)
rapidjson-dev (>=1.1), pkgconf, dh-systemd, libssl-dev (>= 1.0), prometheus-cpp (>= 0.9.0)
Standards-Version: 3.9.8
Homepage: https://wiki.opendaylight.org/view/OpFlex:Main

Expand Down Expand Up @@ -51,7 +51,8 @@ Architecture: any
Build-Profiles: <!norenderer>
Depends:
opflex-agent (>= ${binary:Version}),
opflex-agent-renderer-openvswitch (>= ${binary:Version})
opflex-agent-renderer-openvswitch (>= ${binary:Version}),
prometheus-cpp (>= 0.9.0)
Description: Transitional package for OpFlex Agent and OVS renderer
This package depends on opflex-agent and
opflex-agent-renderer-openvswitch to allow smoother transition from
Expand Down
4 changes: 2 additions & 2 deletions agent-ovs/debian/rules.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ PACKAGE=opflex-agent

override_dh_auto_configure:
if [ -z $(filter norenderer,$(DEB_BUILD_PROFILES)) ]; then \
dh_auto_configure -- --disable-assert --disable-static --with-buildversion=@BVERSION@ ; \
dh_auto_configure -- --disable-assert --disable-static --with-buildversion=@BVERSION@ --enable-prometheus ; \
else \
dh_auto_configure -- --disable-assert --disable-static --with-buildversion=@BVERSION@ --enable-renderer-ovs=no ;\
dh_auto_configure -- --disable-assert --disable-static --with-buildversion=@BVERSION@ --enable-renderer-ovs=no --enable-prometheus ;\
fi

override_dh_auto_test:
Expand Down

0 comments on commit 7cc516e

Please sign in to comment.