diff --git a/src/pmmgr/pmmgr.cxx b/src/pmmgr/pmmgr.cxx index 9456cd0..52b54cd 100644 --- a/src/pmmgr/pmmgr.cxx +++ b/src/pmmgr/pmmgr.cxx @@ -679,9 +679,7 @@ pmmgr_job_spec::note_new_hostid(const pmmgr_hostid& hid, const pcp_context_spec& daemons.insert(make_pair(hid, new pmmgr_pmlogger_daemon(config_directory, hid, spec))); if (get_config_exists("pmie")) - // PR1105 precludes pmie instances on containers - if (spec.find("container=") == string::npos) // ? or & - daemons.insert(make_pair(hid, new pmmgr_pmie_daemon(config_directory, hid, spec))); + daemons.insert(make_pair(hid, new pmmgr_pmie_daemon(config_directory, hid, spec))); } diff --git a/qa/668 b/qa/668 index 83a7837..6523fc4 100755 --- a/qa/668 +++ b/qa/668 @@ -1,5 +1,5 @@ #! /bin/sh -# PCP QA Test No. 666 +# PCP QA Test No. 668 # checks container-related pmmgr functionality # # Copyright (c) 2015 Red Hat, Inc. @@ -12,6 +12,8 @@ echo "QA output created by $seq" . ./common.filter . ./common.check +_check_containers + which pmmgr >/dev/null 2>&1 || _notrun "No pmmgr binary installed" echo pmmgr ok