From 09acf041115f87befb928c16368e2275198a5e92 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Wed, 21 Jan 2015 16:31:08 -0500 Subject: [PATCH 1/2] Add RPM dependency for PyPAM package --- confluent_server/confluent_server.spec.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_server/confluent_server.spec.tmpl b/confluent_server/confluent_server.spec.tmpl index ed1bf460..ae721adf 100644 --- a/confluent_server/confluent_server.spec.tmpl +++ b/confluent_server/confluent_server.spec.tmpl @@ -12,7 +12,7 @@ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Prefix: %{_prefix} BuildArch: noarch -Requires: pyghmi, eventlet, greenlet, confluent_common, pycrypto >= 2.6.1, confluent_client +Requires: pyghmi, eventlet, greenlet, confluent_common, pycrypto >= 2.6.1, confluent_client, PyPAM Vendor: Jarrod Johnson Url: http://xcat.sf.net/ From 78b5cb15ce453f2f996c900f23fa5c93ddd34384 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Wed, 21 Jan 2015 16:35:22 -0500 Subject: [PATCH 2/2] Make ..confluent/plugins/console directory owned by confluent xcathmc.sh is a xCAT console wrapper needed to be placed in the confluent consoles plugin directory. Talking with Jarrod, it was decided that confluent should stay stand-alone and xCAT should ship this and related "glue" items in a separate RPM. The empty 'console' directory should be owned by the confluent RPM --- confluent_server/setup.py.tmpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/confluent_server/setup.py.tmpl b/confluent_server/setup.py.tmpl index 42e02f12..f1976672 100644 --- a/confluent_server/setup.py.tmpl +++ b/confluent_server/setup.py.tmpl @@ -14,5 +14,7 @@ setup( install_requires=['pycrypto>=2.6', 'confluent_client>=0.1.0', 'eventlet', 'pyghmi>=0.6.5'], scripts=['bin/confluent'], - data_files=[('/etc/init.d', ['sysvinit/confluent'])], + data_files=[('/etc/init.d', ['sysvinit/confluent']), + ('/opt/confluent/lib/python/confluent/plugins/console/', [])], + )