Compare commits
10 Commits
d1f7b4df10
...
d5329e34cb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d5329e34cb | ||
|
|
ef98f11686 | ||
|
|
0c2a0d796a | ||
|
|
2f2afb0519 | ||
|
|
eef68ea30d | ||
|
|
69032f0d53 | ||
|
|
1055a62ec3 | ||
|
|
14520b76c7 | ||
|
|
26f8b1e0cd | ||
|
|
c19591a92e |
182
0001-Use-latest-version-of-python-construct.patch
Normal file
182
0001-Use-latest-version-of-python-construct.patch
Normal file
@ -0,0 +1,182 @@
|
||||
From cf440426ffe756dde69092cf38e0103f64ecf58f Mon Sep 17 00:00:00 2001
|
||||
From: zhangy1317 <zhangy1317@chinaunicom.cn>
|
||||
Date: Tue, 22 Mar 2022 16:24:22 +0800
|
||||
Subject: [PATCH] Use latest version of python construct
|
||||
|
||||
---
|
||||
ironic_inspector/common/lldp_parsers.py | 13 +++++++++----
|
||||
ironic_inspector/common/lldp_tlvs.py | 16 +++++++---------
|
||||
.../plugins/local_link_connection.py | 4 ++--
|
||||
.../test/unit/test_plugins_lldp_basic.py | 2 +-
|
||||
lower-constraints.txt | 2 +-
|
||||
.../construct-fly-free-fab62c0a5cb71fa5.yaml | 6 ++++++
|
||||
requirements.txt | 2 +-
|
||||
7 files changed, 27 insertions(+), 18 deletions(-)
|
||||
create mode 100644 ironic-inspector-9.2.4/releasenotes/notes/construct-fly-free-fab62c0a5cb71fa5.yaml
|
||||
|
||||
diff --git a/ironic_inspector/common/lldp_parsers.py b/ironic_inspector/common/lldp_parsers.py
|
||||
index 1f7c21a..336629b 100644
|
||||
--- a/ironic_inspector/common/lldp_parsers.py
|
||||
+++ b/ironic_inspector/common/lldp_parsers.py
|
||||
@@ -101,6 +101,10 @@ class LLDPParser(object):
|
||||
def add_single_value(self, struct, name, data):
|
||||
"""Add a single name/value pair to the nv dict"""
|
||||
self.set_value(name, struct.value)
|
||||
+
|
||||
+ def add_nested_value(self, struct, name, data):
|
||||
+ """Add a single nested name/value pair to the dict"""
|
||||
+ self.set_value(name, struct.value.value)
|
||||
|
||||
def parse_tlv(self, tlv_type, data):
|
||||
"""Parse TLVs from mapping table
|
||||
@@ -193,10 +197,10 @@ class LLDPBasicMgmtParser(LLDPParser):
|
||||
|
||||
self.parser_map = {
|
||||
tlv.LLDP_TLV_CHASSIS_ID:
|
||||
- (self.add_single_value, tlv.ChassisId,
|
||||
- LLDP_CHASSIS_ID_NM, False),
|
||||
+ (self.add_nested_value, tlv.ChassisId, LLDP_CHASSIS_ID_NM,
|
||||
+ False),
|
||||
tlv.LLDP_TLV_PORT_ID:
|
||||
- (self.add_single_value, tlv.PortId, LLDP_PORT_ID_NM, False),
|
||||
+ (self.add_nested_value, tlv.PortId, LLDP_PORT_ID_NM, False),
|
||||
tlv.LLDP_TLV_TTL: (None, None, None, False),
|
||||
tlv.LLDP_TLV_PORT_DESCRIPTION:
|
||||
(self.add_single_value, tlv.PortDesc, LLDP_PORT_DESC_NM,
|
||||
@@ -221,7 +225,8 @@ class LLDPBasicMgmtParser(LLDPParser):
|
||||
|
||||
There can be multiple Mgmt Address TLVs, store in list.
|
||||
"""
|
||||
- self.append_value(name, struct.address)
|
||||
+ if struct.address:
|
||||
+ self.append_value(name, struct.address)
|
||||
|
||||
def _get_capabilities_list(self, caps):
|
||||
"""Get capabilities from bit map"""
|
||||
diff --git a/ironic_inspector/common/lldp_tlvs.py b/ironic_inspector/common/lldp_tlvs.py
|
||||
index 4c2d441..c8d66cb 100644
|
||||
--- a/ironic_inspector/common/lldp_tlvs.py
|
||||
+++ b/ironic_inspector/common/lldp_tlvs.py
|
||||
@@ -107,11 +107,11 @@ IANA_ADDRESS_FAMILY_ID_MAPPING = {
|
||||
('mac', 6): MACAddress,
|
||||
}
|
||||
|
||||
-IANAAddress = core.Embedded(core.Struct(
|
||||
+IANAAddress = core.Struct(
|
||||
'family' / core.Enum(core.Int8ub, **mapping_for_enum(
|
||||
IANA_ADDRESS_FAMILY_ID_MAPPING)),
|
||||
'value' / core.Switch(construct.this.family, mapping_for_switch(
|
||||
- IANA_ADDRESS_FAMILY_ID_MAPPING))))
|
||||
+ IANA_ADDRESS_FAMILY_ID_MAPPING)))
|
||||
|
||||
# Note that 'GreedyString()' is used in cases where string len is not defined
|
||||
CHASSIS_ID_MAPPING = {
|
||||
@@ -132,9 +132,8 @@ CHASSIS_ID_MAPPING = {
|
||||
ChassisId = core.Struct(
|
||||
'subtype' / core.Enum(core.Byte, **mapping_for_enum(
|
||||
CHASSIS_ID_MAPPING)),
|
||||
- 'value' /
|
||||
- core.Embedded(core.Switch(construct.this.subtype,
|
||||
- mapping_for_switch(CHASSIS_ID_MAPPING)))
|
||||
+ 'value' / core.Switch(construct.this.subtype,
|
||||
+ mapping_for_switch(CHASSIS_ID_MAPPING))
|
||||
)
|
||||
|
||||
PORT_ID_MAPPING = {
|
||||
@@ -150,9 +149,8 @@ PORT_ID_MAPPING = {
|
||||
PortId = core.Struct(
|
||||
'subtype' / core.Enum(core.Byte, **mapping_for_enum(
|
||||
PORT_ID_MAPPING)),
|
||||
- 'value' /
|
||||
- core.Embedded(core.Switch(construct.this.subtype,
|
||||
- mapping_for_switch(PORT_ID_MAPPING)))
|
||||
+ 'value' / core.Switch(construct.this.subtype,
|
||||
+ mapping_for_switch(PORT_ID_MAPPING))
|
||||
)
|
||||
|
||||
PortDesc = core.Struct('value' / core.GreedyString("utf8"))
|
||||
@@ -215,7 +213,7 @@ Dot1_VlanName = core.Struct(
|
||||
'vlanid' / core.Int16ub,
|
||||
'name_len' / core.Rebuild(core.Int8ub,
|
||||
construct.len_(construct.this.value)),
|
||||
- 'vlan_name' / core.String(construct.this.name_len, "utf8")
|
||||
+ 'vlan_name' / core.PaddedString(construct.this.name_len, "utf8")
|
||||
)
|
||||
|
||||
Dot1_ProtocolIdentity = core.Struct(
|
||||
diff --git a/ironic_inspector/plugins/local_link_connection.py b/ironic_inspector/plugins/local_link_connection.py
|
||||
index aea9faa..047d5b8 100644
|
||||
--- a/ironic_inspector/plugins/local_link_connection.py
|
||||
+++ b/ironic_inspector/plugins/local_link_connection.py
|
||||
@@ -67,7 +67,7 @@ class GenericLocalLinkConnectionHook(base.ProcessingHook):
|
||||
return
|
||||
|
||||
item = PORT_ID_ITEM_NAME
|
||||
- value = port_id.value
|
||||
+ value = port_id.value.value if port_id.value else None
|
||||
elif tlv_type == tlv.LLDP_TLV_CHASSIS_ID:
|
||||
try:
|
||||
chassis_id = tlv.ChassisId.parse(data)
|
||||
@@ -79,7 +79,7 @@ class GenericLocalLinkConnectionHook(base.ProcessingHook):
|
||||
# Only accept mac address for chassis ID
|
||||
if 'mac_address' in chassis_id.subtype:
|
||||
item = SWITCH_ID_ITEM_NAME
|
||||
- value = chassis_id.value
|
||||
+ value = chassis_id.value.value
|
||||
|
||||
if item and value:
|
||||
if (not CONF.processing.overwrite_existing and
|
||||
diff --git a/ironic_inspector/test/unit/test_plugins_lldp_basic.py b/ironic_inspector/test/unit/test_plugins_lldp_basic.py
|
||||
index ce58932..e9978b6 100644
|
||||
--- a/ironic_inspector/test/unit/test_plugins_lldp_basic.py
|
||||
+++ b/ironic_inspector/test/unit/test_plugins_lldp_basic.py
|
||||
@@ -287,7 +287,7 @@ class TestLLDPBasicProcessingHook(test_base.NodeTest):
|
||||
}]
|
||||
self.hook.before_update(self.data, self.node_info)
|
||||
self.assertEqual(self.expected, self.data['all_interfaces'])
|
||||
- self.assertEqual(2, mock_log.warning.call_count)
|
||||
+ self.assertEqual(1, mock_log.warning.call_count)
|
||||
|
||||
@mock.patch('ironic_inspector.common.lldp_parsers.LOG')
|
||||
def test_truncated_mac(self, mock_log):
|
||||
diff --git a/lower-constraints.txt b/lower-constraints.txt
|
||||
index 38863c1..47c1287 100644
|
||||
--- a/lower-constraints.txt
|
||||
+++ b/lower-constraints.txt
|
||||
@@ -9,7 +9,7 @@ chardet==3.0.4
|
||||
click==6.7
|
||||
cliff==2.11.0
|
||||
cmd2==0.8.1
|
||||
-construct==2.8.10
|
||||
+construct==2.10.56
|
||||
contextlib2==0.5.5
|
||||
coverage==4.0
|
||||
debtcollector==1.19.0
|
||||
diff --git a/releasenotes/notes/construct-fly-free-fab62c0a5cb71fa5.yaml b/releasenotes/notes/construct-fly-free-fab62c0a5cb71fa5.yaml
|
||||
new file mode 100644
|
||||
index 0000000..6cba700
|
||||
--- /dev/null
|
||||
+++ b/releasenotes/notes/construct-fly-free-fab62c0a5cb71fa5.yaml
|
||||
@@ -0,0 +1,6 @@
|
||||
+---
|
||||
+upgrade:
|
||||
+ - |
|
||||
+ Remove upper constraint for python construct library and use the latest
|
||||
+ version available.
|
||||
+ The minimum compatible version for python construct is now 2.10.56
|
||||
diff --git a/requirements.txt b/requirements.txt
|
||||
index 7aed082..1de2911 100644
|
||||
--- a/requirements.txt
|
||||
+++ b/requirements.txt
|
||||
@@ -4,7 +4,7 @@
|
||||
automaton>=1.9.0 # Apache-2.0
|
||||
alembic>=0.8.10 # MIT
|
||||
Babel!=2.4.0,>=2.3.4 # BSD
|
||||
-construct<2.9,>=2.8.10 # MIT
|
||||
+construct>=2.10.56 # MIT
|
||||
eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
|
||||
Flask!=0.11,>=0.10 # BSD
|
||||
futurist>=1.2.0 # Apache-2.0
|
||||
--
|
||||
2.33.0
|
||||
|
||||
Binary file not shown.
BIN
ironic-inspector-9.2.4.tar.gz
Normal file
BIN
ironic-inspector-9.2.4.tar.gz
Normal file
Binary file not shown.
@ -2,13 +2,12 @@
|
||||
%global modulename ironic_inspector
|
||||
%{!?upstream_version: %global upstream_version %{version}}
|
||||
|
||||
%global with_doc 0
|
||||
%global with_tests 1
|
||||
%global with_tests 0
|
||||
|
||||
Name: openstack-ironic-inspector
|
||||
Summary: Hardware introspection service for OpenStack Ironic
|
||||
Version: 10.6.0
|
||||
Release: 1
|
||||
Version: 9.2.4
|
||||
Release: 4
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/ironic-inspector
|
||||
|
||||
@ -20,7 +19,8 @@ Source4: ironic-inspector-rootwrap-sudoers
|
||||
Source5: ironic-inspector.logrotate
|
||||
Source6: ironic-inspector-dist.conf
|
||||
Source7: openstack-ironic-inspector-conductor.service
|
||||
|
||||
Patch0: 0001-Use-latest-version-of-python-construct.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: git-core
|
||||
@ -30,7 +30,7 @@ BuildRequires: python3-pbr
|
||||
BuildRequires: python3-stestr
|
||||
BuildRequires: systemd
|
||||
# All these are required to run tests during check step
|
||||
BuildRequires: python3-mock >= 3.0.5
|
||||
BuildRequires: python3-mock
|
||||
BuildRequires: python3-alembic
|
||||
BuildRequires: python3-automaton
|
||||
BuildRequires: python3-eventlet
|
||||
@ -67,81 +67,33 @@ BuildRequires: python3-jsonpath-rw
|
||||
BuildRequires: python3-retrying
|
||||
BuildRequires: python3-pytz
|
||||
|
||||
%{?systemd_requires}
|
||||
Requires: openstack-ironic-inspector-api
|
||||
Requires: openstack-ironic-inspector-conductor
|
||||
Requires: openstack-ironic-inspector-dnsmasq
|
||||
|
||||
Requires: python3-alembic >= 1.4.2
|
||||
Requires: python3-automaton >= 1.9.0
|
||||
Requires: python3-construct >= 2.9.39
|
||||
Requires: python3-eventlet >= 0.26.0
|
||||
Requires: python3-flask >= 1.1.0
|
||||
Requires: python3-futurist >= 1.2.0
|
||||
Requires: python3-ironic-lib >= 4.3.0
|
||||
Requires: python3-jsonpath-rw >= 1.2.0
|
||||
Requires: python3-jsonschema >= 3.2.0
|
||||
Requires: python3-keystoneauth1 >= 4.2.0
|
||||
Requires: python3-keystonemiddleware >= 4.18.0
|
||||
Requires: python3-netaddr >= 0.7.18
|
||||
Requires: python3-openstacksdk >= 0.40.0
|
||||
Requires: python3-oslo-concurrency >= 3.26.0
|
||||
Requires: python3-oslo-config >= 6.8.0
|
||||
Requires: python3-oslo-context >= 2.19.2
|
||||
Requires: python3-oslo-db >= 6.0.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-log >= 3.36.0
|
||||
Requires: python3-oslo-messaging >= 5.32.0
|
||||
Requires: python3-oslo-middleware >= 3.31.0
|
||||
Requires: python3-oslo-policy >= 3.6.0
|
||||
Requires: python3-oslo-rootwrap >= 5.8.0
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-service >= 1.24.0
|
||||
Requires: python3-oslo-utils >= 4.5.0
|
||||
Requires: python3-pbr >= 2.0.0
|
||||
Requires: python3-pytz >= 2013.6
|
||||
Requires: python3-sqlalchemy >= 1.2.19
|
||||
Requires: python3-stevedore >= 1.20.0
|
||||
Requires: python3-tooz >= 2.5.1
|
||||
Requires: python3-tenacity >= 6.2.0
|
||||
Requires: python3-yaml >= 5.3.1
|
||||
Requires: python3-oslo-upgradecheck >= 1.2.0
|
||||
|
||||
|
||||
Obsoletes: openstack-ironic-discoverd < 1.1.1
|
||||
Provides: openstack-ironic-discoverd = %{upstream_version}
|
||||
|
||||
%description
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
scheduling from a bare metal node, given its power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains Python modules and an ironic-inspector service combining
|
||||
API and conductor in one binary.
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%package -n openstack-ironic-inspector-doc
|
||||
Summary: Documentation for Ironic Inspector.
|
||||
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: python3-openstackdocstheme
|
||||
BuildRequires: python3-sphinxcontrib-apidoc
|
||||
# BuildRequires: python3-sphinxcontrib-rsvgconverter
|
||||
|
||||
%description -n openstack-ironic-inspector-doc
|
||||
Documentation for Ironic Inspector.
|
||||
%endif
|
||||
|
||||
%package -n openstack-ironic-inspector-dnsmasq
|
||||
Summary: DHCP service for ironic-inspector using dnsmasq
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: openstack-ironic-inspector-common = %{version}-%{release}
|
||||
Requires: dnsmasq
|
||||
|
||||
%description -n openstack-ironic-inspector-dnsmasq
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
scheduling from a bare metal node, given its power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains a dnsmasq service pre-configured for using with
|
||||
@ -150,13 +102,13 @@ ironic-inspector.
|
||||
%package -n openstack-ironic-inspector-conductor
|
||||
Summary: Conductor service for Ironic Inspector.
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: openstack-ironic-inspector-common = %{version}-%{release}
|
||||
|
||||
%description -n openstack-ironic-inspector-conductor
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
scheduling from a bare metal node, given its power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains an ironic-inspector conductor service, which can be used
|
||||
@ -165,23 +117,74 @@ to split ironic-inspector into API and conductor processes.
|
||||
%package -n openstack-ironic-inspector-api
|
||||
Summary: WSGI service service for Ironic Inspector.
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: openstack-ironic-inspector-common = %{version}-%{release}
|
||||
|
||||
%description -n openstack-ironic-inspector-api
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
scheduling from a bare metal node, given its power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains an ironic-inspector WSGI service, which can be used
|
||||
to split ironic-inspector into API and conductor processes.
|
||||
|
||||
%package -n openstack-ironic-inspector-common
|
||||
Summary: Contains the common files required by the service
|
||||
|
||||
Requires: python3-%{service} = %{version}-%{release}
|
||||
|
||||
%description -n openstack-ironic-inspector-common
|
||||
Contains the common files required by the service
|
||||
|
||||
%package -n python3-%{service}
|
||||
Summary: %{service} source code
|
||||
|
||||
%{?systemd_requires}
|
||||
|
||||
Requires: python3-alembic
|
||||
Requires: python3-automaton
|
||||
Requires: python3-construct
|
||||
Requires: python3-eventlet
|
||||
Requires: python3-flask
|
||||
Requires: python3-futurist
|
||||
Requires: python3-ironic-lib
|
||||
Requires: python3-jsonpath-rw
|
||||
Requires: python3-jsonschema
|
||||
Requires: python3-keystoneauth1
|
||||
Requires: python3-keystonemiddleware
|
||||
Requires: python3-netaddr
|
||||
Requires: python3-openstacksdk
|
||||
Requires: python3-oslo-concurrency
|
||||
Requires: python3-oslo-config
|
||||
Requires: python3-oslo-context
|
||||
Requires: python3-oslo-db
|
||||
Requires: python3-oslo-i18n
|
||||
Requires: python3-oslo-log
|
||||
Requires: python3-oslo-messaging
|
||||
Requires: python3-oslo-middleware
|
||||
Requires: python3-oslo-policy
|
||||
Requires: python3-oslo-rootwrap
|
||||
Requires: python3-oslo-serialization
|
||||
Requires: python3-oslo-service
|
||||
Requires: python3-oslo-utils
|
||||
Requires: python3-pbr
|
||||
Requires: python3-pytz
|
||||
Requires: python3-sqlalchemy
|
||||
Requires: python3-stevedore
|
||||
Requires: python3-tooz
|
||||
Requires: python3-tenacity
|
||||
Requires: python3-yaml
|
||||
Requires: python3-oslo-upgradecheck
|
||||
|
||||
%description -n python3-%{service}
|
||||
It contains the project python source code
|
||||
|
||||
%package -n python3-%{service}-tests
|
||||
Summary: %{service} Unit Tests
|
||||
%{?python_provide:%python_provide python2-%{service}-tests}
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: python3-%{service} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{service}-tests
|
||||
It contains the unit tests
|
||||
@ -194,11 +197,6 @@ It contains the unit tests
|
||||
|
||||
%build
|
||||
%{py3_build}
|
||||
%if 0%{?with_doc}
|
||||
export PYTHONPATH=.
|
||||
sphinx-build -b html doc/source doc/build/html
|
||||
rm -rf doc/build/html/.{doctrees,buildinfo}
|
||||
%endif
|
||||
|
||||
%install
|
||||
%{py3_install}
|
||||
@ -252,30 +250,7 @@ PYTHON=%{__python3} stestr run --test-path ironic_inspector.test.unit
|
||||
%files
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%config(noreplace) %attr(-,root,ironic-inspector) %{_sysconfdir}/ironic-inspector
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-ironic-inspector
|
||||
%{_sysconfdir}/sudoers.d/ironic-inspector
|
||||
%{python3_sitelib}/%{modulename}
|
||||
%{python3_sitelib}/%{modulename}-*.egg-info
|
||||
%exclude %{python3_sitelib}/%{modulename}/test
|
||||
%{_bindir}/ironic-inspector
|
||||
%{_bindir}/ironic-inspector-rootwrap
|
||||
%{_bindir}/ironic-inspector-dbsync
|
||||
%{_bindir}/ironic-inspector-status
|
||||
%{_bindir}/ironic-inspector-migrate-data
|
||||
%{_unitdir}/openstack-ironic-inspector.service
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_sharedstatedir}/ironic-inspector
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_sharedstatedir}/ironic-inspector/dhcp-hostsdir
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_localstatedir}/log/ironic-inspector
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_localstatedir}/log/ironic-inspector/ramdisk/
|
||||
%doc %{_mandir}/man8/ironic-inspector.8.gz
|
||||
%exclude %{python3_sitelib}/%{modulename}_tests.egg-info
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%files -n openstack-ironic-inspector-doc
|
||||
%license LICENSE
|
||||
%doc CONTRIBUTING.rst doc/build/html
|
||||
%endif
|
||||
|
||||
%files -n openstack-ironic-inspector-dnsmasq
|
||||
%license LICENSE
|
||||
@ -290,11 +265,33 @@ PYTHON=%{__python3} stestr run --test-path ironic_inspector.test.unit
|
||||
%license LICENSE
|
||||
%{_bindir}/ironic-inspector-api-wsgi
|
||||
|
||||
%files -n openstack-ironic-inspector-common
|
||||
%license LICENSE
|
||||
%config(noreplace) %attr(-,root,ironic-inspector) %{_sysconfdir}/ironic-inspector
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-ironic-inspector
|
||||
%{_sysconfdir}/sudoers.d/ironic-inspector
|
||||
%{_bindir}/ironic-inspector
|
||||
%{_bindir}/ironic-inspector-rootwrap
|
||||
%{_bindir}/ironic-inspector-dbsync
|
||||
%{_bindir}/ironic-inspector-migrate-data
|
||||
%{_unitdir}/openstack-ironic-inspector.service
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_sharedstatedir}/ironic-inspector
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_sharedstatedir}/ironic-inspector/dhcp-hostsdir
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_localstatedir}/log/ironic-inspector
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_localstatedir}/log/ironic-inspector/ramdisk/
|
||||
|
||||
%files -n python3-%{service}
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/%{modulename}
|
||||
%{python3_sitelib}/%{modulename}-*.egg-info
|
||||
%exclude %{python3_sitelib}/%{modulename}/test
|
||||
%exclude %{python3_sitelib}/%{modulename}_tests.egg-info
|
||||
|
||||
%files -n python3-%{service}-tests
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/%{modulename}/test
|
||||
|
||||
%pre
|
||||
%pre common
|
||||
getent group ironic-inspector >/dev/null || groupadd -r ironic-inspector
|
||||
getent passwd ironic-inspector >/dev/null || \
|
||||
useradd -r -g ironic-inspector -d %{_sharedstatedir}/ironic-inspector -s /sbin/nologin \
|
||||
@ -329,16 +326,14 @@ exit 0
|
||||
%systemd_postun_with_restart openstack-ironic-inspector-conductor.service
|
||||
|
||||
%changelog
|
||||
* Mon Jul 26 2021 liksh <liks11@chinaunicom.cn> 10.6.0-1
|
||||
- Update to 10.6.0
|
||||
* Fri Apr 01 2022 lijiawei <ljw1101.vip@gmail.com> -9.2.4-4
|
||||
- Fix the creation of user and group
|
||||
|
||||
* Mon Mar 15 2021 joec88<chens141@chinaunicom.cn> - 10.5.0-3
|
||||
- Add inspector-dist.conf; Add config-file option to service
|
||||
|
||||
* Thu Mar 11 2021 wangxiyuan<wangxiyuan1007@gmail.com> - 10.5.0-2
|
||||
- Fix sudoers file parse error
|
||||
|
||||
* Thu Feb 4 2021 wangxiyuan<wangxiyuan1007@gmail.com> - 10.5.0-1
|
||||
- Package init
|
||||
* Tue Mar 22 2022 zhangy1317 <zhangy1317@chinaunicom.cn> -9.2.4-3
|
||||
- Fix latest version of python construct
|
||||
|
||||
* Fri Nov 12 2021 wangxiyuan <wangxiyuan1007@gmail.com> - 9.2.4-2
|
||||
- Fix build issue
|
||||
|
||||
* Mon Nov 8 2021 huangtianhua<huangtianhua@huawei.com> - 9.2.4-1
|
||||
- Init openstack-ironic-inspector with 9.2.4 for Train
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user