From 518f1f4b5669cbc1aa4e47930a7b79d8851a2879 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Tue, 7 Aug 2018 13:28:57 -0400
Subject: [PATCH] Add distributed cloud repos to StarlingX

Depends-On: https://review.openstack.org/589565
Change-Id: Ibc7d66eeb5000834cc6bb89a1248323f91d0c337
Story: 2002834
Task: 22753
Signed-off-by: Scott Little <scott.little@windriver.com>
---
 openstack/distributedcloud-client/centos/build_srpm.data | 4 ++--
 openstack/distributedcloud/centos/build_srpm.data        | 4 ++--
 openstack/distributedcloud/centos/distributedcloud.spec  | 8 +++++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/openstack/distributedcloud-client/centos/build_srpm.data b/openstack/distributedcloud-client/centos/build_srpm.data
index bb5a8712..f368b187 100644
--- a/openstack/distributedcloud-client/centos/build_srpm.data
+++ b/openstack/distributedcloud-client/centos/build_srpm.data
@@ -1,5 +1,5 @@
 TAR_NAME="distributedcloud-client"
 SRC_DIR="$CGCS_BASE/git/distributedcloud-client"
 
-TIS_BASE_SRCREV=078b0eed0d9e9de5d5b0f5d82b3f13e7bcfb5d10
-TIS_PATCH_VER=1
+TIS_BASE_SRCREV=640ee2a980c72b6f97fdd5aef1a66196b4c09272
+TIS_PATCH_VER=GITREVCOUNT+2
diff --git a/openstack/distributedcloud/centos/build_srpm.data b/openstack/distributedcloud/centos/build_srpm.data
index f1572767..c5e5809c 100644
--- a/openstack/distributedcloud/centos/build_srpm.data
+++ b/openstack/distributedcloud/centos/build_srpm.data
@@ -2,5 +2,5 @@ TAR_NAME="distributedcloud"
 SRC_DIR="$CGCS_BASE/git/distributedcloud"
 COPY_LIST="$FILES_BASE/*"
 
-TIS_BASE_SRCREV=ea7caa8567120384a0b6a7abbb567fcc7d22188b
-TIS_PATCH_VER=7
+TIS_BASE_SRCREV=e82c7b43362bceb8d4ae9d121d023e42268204db
+TIS_PATCH_VER=GITREVCOUNT+8
diff --git a/openstack/distributedcloud/centos/distributedcloud.spec b/openstack/distributedcloud/centos/distributedcloud.spec
index 5c5da172..974319b1 100644
--- a/openstack/distributedcloud/centos/distributedcloud.spec
+++ b/openstack/distributedcloud/centos/distributedcloud.spec
@@ -169,4 +169,10 @@ install -p -D -m 640 %{_builddir}/%{pypi_name}-%{version}/etc/dcorch/dcorch.conf
 %dir %attr(0755,root,root) %{_localstatedir}/run/dcorch
 %dir %attr(0755,root,root) %{_localstatedir}/cache/dcorch
 %dir %attr(0755,root,root) %{_sysconfdir}/dcorch
-%config(noreplace) %attr(-, root, root) %{_sysconfdir}/dcorch/dcorch.conf
+%config(noreplace) %attr(-, dcorch, dcorch) %{_sysconfdir}/dcorch/dcorch.conf
+%pre dcorch
+getent group dcorch >/dev/null || groupadd -r --gid 173 dcorch
+getent passwd dcorch >/dev/null || \
+useradd --uid 173 -r -g dcorch -d /var/lib/dcorch -s /sbin/nologin \
+-c "dcorch Daemons" dcorch
+exit 0