Expose PCP ports; correct firewall files

Author: portante

agent/config/firewalld/pbench-redis.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <service>
-  <short>pbench-tool-data-sink</short>
-  <description>Pbench Agent Tool Data Sink</description>
-  <port protocol="tcp" port="8080"/>
+  <short>pbench-redis</short>
+  <description>Pbench Agent Redis Server</description>
+  <port protocol="tcp" port="17001"/>
 </service>

agent/config/firewalld/pbench-tool-data-sink.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <service>
-  <short>pbench-redis</short>
-  <description>Pbench Agent Redis Server</description>
-  <port protocol="tcp" port="17001"/>
+  <short>pbench-tool-data-sink</short>
+  <description>Pbench Agent Tool Data Sink</description>
+  <port protocol="tcp" port="8080"/>
 </service>

agent/containers/images/Dockerfile.tds.j2

@@ -3,6 +3,7 @@ FROM pbench-agent-tools-{{ distro }}:{{ tag }}
 
 VOLUME /var/lib/pbench-agent
 
-# Port 8080 should be Bottle server, 9090 optional Prometheus server
-EXPOSE 8080 9090
+# Port 8080 should be Bottle server, 9090 optional Prometheus server, and 44566
+# the optional pmproxy server.
+EXPOSE 8080 9090 44566
 ENTRYPOINT [ "/opt/pbench-agent/util-scripts/tool-meister/tool-data-sink-ep" ]

agent/containers/images/Dockerfile.tm.j2

@@ -1,6 +1,7 @@
 # {{ distro }} pbench-agent-tool-meister image
 FROM pbench-agent-tools-{{ distro }}:{{ tag }}
 
-# Port 8000 should be the optional dcgm tool, and 9100 the optional node_exporter tool.
-EXPOSE 8000 9100
+# Port 8000 should be the optional dcgm tool, 9100 the optional node_exporter
+# tool, and 55677 the pcp (pmcd) tool.
+EXPOSE 8000 9100 55677
 ENTRYPOINT [ "/opt/pbench-agent/util-scripts/tool-meister/tool-meister-ep" ]