diff --git a/openstack/distributedcloud/centos/distributedcloud.spec b/openstack/distributedcloud/centos/distributedcloud.spec index 781c82b3..50a8026e 100644 --- a/openstack/distributedcloud/centos/distributedcloud.spec +++ b/openstack/distributedcloud/centos/distributedcloud.spec @@ -24,9 +24,10 @@ Source5: dcorch-sysinv-api-proxy.service Source6: dcorch-snmp.service Source7: dcorch-identity-api-proxy.service Source8: dcdbsync-api.service -Source9: dcmanager.conf -Source10: dcorch.conf -Source11: dcdbsync.conf +Source9: dcdbsync-openstack-api.service +Source10: dcmanager.conf +Source11: dcorch.conf +Source12: dcdbsync.conf BuildArch: noarch @@ -121,7 +122,7 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/dcmanager/ # install systemd unit files install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/dcmanager-api.service install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/dcmanager-manager.service -install -p -D -m 644 %{SOURCE9} %{buildroot}%{_tmpfilesdir} +install -p -D -m 644 %{SOURCE10} %{buildroot}%{_tmpfilesdir} # install default config files cd %{_builddir}/%{pypi_name}-%{version} && oslo-config-generator --config-file ./dcmanager/config-generator.conf --output-file %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcmanager/dcmanager.conf.sample install -p -D -m 640 %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcmanager/dcmanager.conf.sample %{buildroot}%{_sysconfdir}/dcmanager/dcmanager.conf @@ -136,7 +137,7 @@ install -p -D -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/dcorch-engine.service install -p -D -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/dcorch-sysinv-api-proxy.service install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/dcorch-snmp.service install -p -D -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/dcorch-identity-api-proxy.service -install -p -D -m 644 %{SOURCE10} %{buildroot}%{_tmpfilesdir} +install -p -D -m 644 %{SOURCE11} %{buildroot}%{_tmpfilesdir} # install ocf scripts install -d -m 755 ${RPM_BUILD_ROOT}/usr/lib/ocf/resource.d/openstack @@ -152,7 +153,9 @@ install -d -m 755 %{buildroot}/var/cache/dcdbsync install -d -m 755 %{buildroot}%{_sysconfdir}/dcdbsync/ # install systemd unit files install -p -D -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/dcdbsync-api.service -install -p -D -m 644 %{SOURCE11} %{buildroot}%{_tmpfilesdir} +# install systemd unit files for optional second instance +install -p -D -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/dcdbsync-openstack-api.service +install -p -D -m 644 %{SOURCE12} %{buildroot}%{_tmpfilesdir} # install default config files cd %{_builddir}/%{pypi_name}-%{version} && oslo-config-generator --config-file ./dcdbsync/config-generator.conf --output-file %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcdbsync/dcdbsync.conf.sample install -p -D -m 640 %{_builddir}/%{pypi_name}-%{version}%{_sysconfdir}/dcdbsync/dcdbsync.conf.sample %{buildroot}%{_sysconfdir}/dcdbsync/dcdbsync.conf @@ -213,6 +216,7 @@ install -d -m 600 ${RPM_BUILD_ROOT}/opt/dc/ansible %exclude %{python2_sitelib}/dcdbsync/tests %{_bindir}/dcdbsync-api %{_unitdir}/dcdbsync-api.service +%{_unitdir}/dcdbsync-openstack-api.service %{_tmpfilesdir}/dcdbsync.conf %dir %attr(0755,root,root) %{_localstatedir}/log/dcdbsync %dir %attr(0755,root,root) %{_localstatedir}/cache/dcdbsync diff --git a/openstack/distributedcloud/centos/files/dcdbsync-openstack-api.service b/openstack/distributedcloud/centos/files/dcdbsync-openstack-api.service new file mode 100644 index 00000000..01ece786 --- /dev/null +++ b/openstack/distributedcloud/centos/files/dcdbsync-openstack-api.service @@ -0,0 +1,12 @@ +[Unit] +Description=DC DBsync Agent API Service For Containerized Openstack +After=syslog.target network.target postgresql.service + +[Service] +Type=simple +User=root +ExecStart=/usr/bin/dcdbsync-api --config-file /etc/dcdbsync/dcdbsync_openstack.conf +Restart=on-failure + +[Install] +WantedBy=multi-user.target