Apply commits from master onto R6.0-WIP

Add liburcu-dev as a build requirement
Hardware offloads require rcu to enable safe runtime plugging and
unplugging.
Partial-Bug: #1767107
Signed-off-by: Frik Botha <frederick.botha@netronome.com>

add ironic clients & ipmitool packages needed for server discovery
Partial-Bug: #1807762

Adding packages required by API server and DM
Depends-On: If7d3850e7d80087744ba428ca4bb03c5ec152352
Partial-Bug: #1780580

Use %config(noreplace) for config/ini dpdk files
partial-jira-bug: JCB-218657

Don't require python2-pip on RHEL
This package does not exist in RHEL yum repos, so it breaks the build.
closes-jira-bug: JCB-218785

Updated package dependency for 'Rocky' builds
When installing packages from the openstack rocky repo, they now require
python2-docker which obsoletes python-docker-py. This change is done only for
centos 7.x builds.
Partial-Jira-Bug: JCB-218848

remove init.d files and conf files from packages
these files are not needed in R5.x
Closes-Bug: #1786604

remove dependency to vrouter-netns from dpdk-init package
Closes-Bug: #1786604

Change-Id: Id0d8555b96deeafaa8c6b2cd4acc28e61e9c0f32
Partial-jira-bug: JBE-925

debian/contrail/debian/control

@@ -67,6 +67,7 @@ Build-Depends: autoconf,
                libhttp-parser-dev,
                libxml2-dev,
                libicu-dev,
+               liburcu-dev,
                dh-systemd
 
 Package: contrail-analytics

rpm/contrail-nodemgr/contrail-nodemgr.spec

@@ -55,7 +55,9 @@ BuildRequires: flex
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: make
+%if 0%{?centos}
 BuildRequires: python2-pip
+%endif
 
 %description
 Contrail Nodemgr package

rpm/contrail-vrouter-dpdk-init/contrail-vrouter-dpdk-init.spec

@@ -30,7 +30,6 @@ Requires: contrail-vrouter-dpdk >= %{_verstr}-%{_relstr}
 Requires: contrail-vrouter-utils >= %{_verstr}-%{_relstr}
 Requires: contrail-vrouter-agent >= %{_verstr}-%{_relstr}
 Requires: python-contrail-vrouter-api >= %{_verstr}-%{_relstr}
-Requires: python-opencontrail-vrouter-netns >= %{_verstr}-%{_relstr}
 
 %description
 Provides init files and utils for DPDK vRouter
@@ -66,7 +65,7 @@ install -p -m 755 %{_distropkgdir}/core-pattern.upstart %{buildroot}%{_etc_init}
 %defattr(-,root,root,-)
 %{_opt_bin}/*
 %{_usr_bin}/*
-%{_contrailetc}/*
+%config(noreplace) %{_contrailetc}/*
 %{_etc_init}/*
 
 %post

rpm/contrail-vrouter-dpdk/contrail-vrouter-dpdk.spec

@@ -56,9 +56,11 @@ BuildRequires: gcc
 BuildRequires: flex
 BuildRequires: bison
 BuildRequires: gcc-c++
-BuildRequires: python2-pip
 BuildRequires: libpcap
 BuildRequires: libpcap-devel
+%if 0%{?centos}
+BuildRequires: python2-pip
+%endif
 Requires: liburcu2
 Requires: libnl3
 Requires: numactl-libs

rpm/contrail/contrail.spec

@@ -339,6 +339,9 @@ Group:              Applications/System
 Requires:           contrail-config >= %{_verstr}-%{_relstr}
 Requires:           python-keystoneclient
 Requires:           python-novaclient
+Requires:           python-ironic-inspector-client
+Requires:           python-ironicclient
+Requires:           ipmitool
 
 %description config-openstack
 Contrail config openstack package
@@ -347,12 +350,7 @@ This package contains the configuration management modules that interface with O
 %{python_sitelib}/svc_monitor*
 %{python_sitelib}/vnc_openstack*
 %{_bindir}/contrail-svc-monitor
-%config(noreplace) %{_contrailetc}/contrail-svc-monitor.conf
 /usr/share/contrail
-/etc/init.d/contrail-svc-monitor
-
-%post config-openstack
-chmod +x /etc/init.d/contrail-svc-monitor
 
 %package -n python-contrail-vrouter-api
 Summary:            Contrail vrouter api
@@ -465,8 +463,6 @@ package provides the contrail-vrouter user space agent.
 %{_bindir}/contrail-toragent-cleanup
 %{_bindir}/contrail-vrouter-agent-health-check.py
 %{_bindir}/contrail_crypt_tunnel_client.py
-%config(noreplace) %{_contrailetc}/contrail-vrouter-agent.conf
-/etc/init.d/contrail-vrouter-agent
 %{python_sitelib}/contrail_vrouter_provisioning*
 %{python_sitelib}/ContrailVrouterCli*
 
@@ -490,7 +486,6 @@ chmod 0750 /etc/contrail/ /etc/contrail/ssl/ /etc/contrail/ssl/certs/
 chmod 0700 /etc/contrail/ssl/private/
 chmod 0750 /var/lib/contrail/dhcp/
 chmod 0750 /var/lib/contrail/backup/
-chmod +x /etc/init.d/contrail-vrouter-agent
 
 %package control
 Summary:          Contrail Control
@@ -529,8 +524,6 @@ eventually consistent.
 %files control
 %defattr(-,root,root,-)
 %{_bindir}/contrail-control*
-%config(noreplace) %{_contrailetc}/contrail-control.conf
-/etc/init.d/contrail-control
 %{python_sitelib}/ContrailControlCli*
 
 %pre control
@@ -555,7 +548,6 @@ if [ ! -f /etc/authbind/byport/179 ]; then
   chown contrail. /etc/authbind/byport/179
   chmod 0755 /etc/authbind/byport/179
 fi
-chmod +x /etc/init.d/contrail-control
 
 %package -n python-opencontrail-vrouter-netns
 
@@ -565,7 +557,7 @@ Group:              Applications/System
 
 %if 0%{?rhel} > 6
 Requires:           python-websocket-client >= 0.32.0
-Requires:           python-docker-py >= 1.4.0
+Requires:           python2-docker
 %else
 Requires:           python-docker-py
 %endif
@@ -643,6 +635,12 @@ Requires:           python2-tenacity == 4.10
 Requires:           python-grpcio == 1.16.0rc1
 Requires:           python-protobuf == 3.6.1
 Requires:           python-etcd3 == 0.8.1
+Requires:           python-attrdict
+%if 0%{?rhel} > 6
+Requires:           python2-docker
+%else
+Requires:           python-docker-py
+%endif
 
 %description config
 Contrail Config package
@@ -670,10 +668,6 @@ in a NoSQL database.
 
 %files config
 %defattr(-,contrail,contrail,-)
-%config(noreplace) %{_sysconfdir}/contrail/contrail-api.conf
-%config(noreplace) %{_sysconfdir}/contrail/contrail-schema.conf
-%config(noreplace) %{_sysconfdir}/contrail/contrail-device-manager.conf
-%config(noreplace) %{_sysconfdir}/contrail/contrail-fabric-ansible.conf
 %defattr(-,root,root,-)
 %{_bindir}/contrail-api*
 %{_bindir}/contrail-schema*
@@ -696,9 +690,6 @@ in a NoSQL database.
 %docdir /usr/share/doc/contrail-config/
 /usr/share/doc/contrail-config/
 %endif
-/etc/init.d/contrail-schema
-/etc/init.d/contrail-device-manager
-/etc/init.d/contrail-api
 
 %pre config
 set -e
@@ -715,9 +706,6 @@ chown -R contrail:adm /var/log/contrail
 chmod 0750 /var/log/contrail
 chown -R contrail:contrail /var/lib/contrail/ /etc/contrail/
 chmod 0750 /etc/contrail/
-chmod +x /etc/init.d/contrail-api
-chmod +x /etc/init.d/contrail-schema
-chmod +x /etc/init.d/contrail-device-manager
 tar -xvzf %{_fabricansible}/*.tar.gz -C %{_fabricansible}
 mv %{_fabricansible}/fabric_ansible_playbooks-0.1dev/* %{_fabricansible}/
 rmdir  %{_fabricansible}/fabric_ansible_playbooks-0.1dev/
@@ -774,12 +762,6 @@ This information includes statistics,logs, events, and errors.
 %files analytics
 # Setup directories
 %defattr(-,contrail,contrail,)
-%config(noreplace) %{_contrailetc}/contrail-collector.conf
-%config(noreplace) %{_contrailetc}/contrail-analytics-api.conf
-%config(noreplace) %{_contrailetc}/contrail-query-engine.conf
-%config(noreplace) %{_contrailetc}/contrail-snmp-collector.conf
-%config(noreplace) %{_contrailetc}/contrail-topology.conf
-%config(noreplace) %{_contrailetc}/contrail-alarm-gen.conf
 %defattr(-, root, root)
 %{_bindir}/contrail-collector*
 %{_bindir}/contrail-query-engine*
@@ -799,12 +781,6 @@ This information includes statistics,logs, events, and errors.
 %{_bindir}/contrail-snmp-*
 %{_bindir}/contrail-topology
 /usr/share/doc/contrail-analytics-api
-/etc/init.d/contrail-analytics-api
-/etc/init.d/contrail-alarm-gen
-/etc/init.d/contrail-collector
-/etc/init.d/contrail-query-engine
-/etc/init.d/contrail-snmp-collector
-/etc/init.d/contrail-topology
 /usr/share/mibs/netsnmp
 /etc/contrail/snmp.conf
 
@@ -823,12 +799,6 @@ chown -R contrail:adm /var/log/contrail
 chmod 0750 /var/log/contrail
 chown -R contrail:contrail /var/lib/contrail/ /etc/contrail/
 chmod 0750 /etc/contrail/
-chmod +x /etc/init.d/contrail-analytics-api
-chmod +x /etc/init.d/contrail-alarm-gen
-chmod +x /etc/init.d/contrail-collector
-chmod +x /etc/init.d/contrail-query-engine
-chmod +x /etc/init.d/contrail-snmp-collector
-chmod +x /etc/init.d/contrail-topology
 
 %package dns
 Summary:            Contrail Dns
@@ -857,8 +827,6 @@ chown -R contrail:adm /var/log/contrail
 chmod 0750 /var/log/contrail
 chown -R contrail. /etc/contrail/dns
 chmod 0750 /etc/contrail/dns
-chmod +x /etc/init.d/contrail-dns
-chmod +x /etc/init.d/contrail-named
 
 # Use authbind to bind amed on a reserved port,
 # with contrail user privileges
@@ -871,10 +839,7 @@ fi
 %files dns
 %defattr(-,contrail,contrail,-)
 %{_contraildns}
-%config(noreplace) %{_contraildns}/contrail-named.conf
-%config(noreplace) %{_contraildns}/contrail-rndc.conf
 %config(noreplace) %{_contraildns}/applynamedconfig.py
-%config(noreplace) %{_contrailetc}/contrail-dns.conf
 %{_contraildns}/COPYRIGHT
 %defattr(-, root, root)
 %{_bindir}/contrail-named*
@@ -884,8 +849,6 @@ fi
 %if 0%{?rhel} > 6
 %docdir %{python2_sitelib}/doc/*
 %endif
-/etc/init.d/contrail-dns
-/etc/init.d/contrail-named
 
 %package nova-vif
 Summary:            Contrail nova vif driver