Merge remote-tracking branch 'gerrit/master' into f/centos76

Change-Id: If3c66a64a3b663a5af9981765cab7462dda4307e
Signed-off-by: Saul Wold <sgw@linux.intel.com>

centos_pkg_dirs

@@ -100,6 +100,7 @@ monitoring/influxdb-extensions
 kubernetes/kubernetes
 kubernetes/docker-distribution
 kubernetes/helm
+kubernetes/registry-token-server
 logging/logmgmt
 filesystem/filesystem-scripts
 utilities/branding

config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/build_srpm.data

@@ -1 +1 @@
-TIS_PATCH_VER=6
+TIS_PATCH_VER=7

config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/0007-Add-StarlingX-specific-restart-command-for-Ceph-moni.patch

@@ -0,0 +1,32 @@
+From b590f06d6f6ce2bd71d4d0389b6d51a78e225c19 Mon Sep 17 00:00:00 2001
+From: Ovidiu Poncea <ovidiu.poncea@windriver.com>
+Date: Thu, 20 Dec 2018 08:07:15 -0500
+Subject: [PATCH] Add-StarlingX-specific-restart-command-for-Ceph-moni patch
+
+---
+ SPECS/puppet-ceph.spec | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/SPECS/puppet-ceph.spec b/SPECS/puppet-ceph.spec
+index 0b728a1..e5cc64c 100644
+--- a/SPECS/puppet-ceph.spec
++++ b/SPECS/puppet-ceph.spec
+@@ -14,6 +14,7 @@ Patch0003:      0003-Ceph-Jewel-rebase.patch
+ Patch0004:      0004-US92424-Add-OSD-support-for-persistent-naming.patch
+ Patch0005:      0005-Remove-puppetlabs-apt-as-ceph-requirement.patch
+ Patch0006:      0006-ceph-disk-prepare-invalid-data-disk-value.patch
++Patch0007:      0007-Add-StarlingX-specific-restart-command-for-Ceph-moni.patch
+ 
+ BuildArch:      noarch
+ 
+@@ -35,6 +36,7 @@ Community Developed Ceph Module
+ %patch0004 -p1
+ %patch0005 -p1
+ %patch0006 -p1
++%patch0007 -p1
+ 
+ find . -type f -name ".*" -exec rm {} +
+ find . -size 0 -exec rm {} +
+-- 
+1.8.3.1
+

config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/meta_patches/PATCH_ORDER

@@ -4,3 +4,4 @@
 0004-Add-OSD-support-for-persistent-naming.patch
 0005-meta-patch-for-patch5.patch
 0006-add-ceph-disk-prepare-invalid-data-disk-value-patch.patch
+0007-Add-StarlingX-specific-restart-command-for-Ceph-moni.patch

config/puppet-modules/openstack/puppet-ceph-2.2.0/centos/patches/0007-Add-StarlingX-specific-restart-command-for-Ceph-moni.patch

@@ -0,0 +1,35 @@
+From a364f37cacab78cdaad5ebd23ab24cf400a3fa40 Mon Sep 17 00:00:00 2001
+From: Ovidiu Poncea <ovidiu.poncea@windriver.com>
+Date: Thu, 20 Dec 2018 07:18:55 -0500
+Subject: [PATCH] Add StarlingX specific restart command for Ceph monitors
+
+Since we don't use systemd to manage Ceph and we have pmon monitoring we
+have to make sure that:
+1. Restarting is properly handled as "systemctl restart" will return error
+   and manifest will fail;
+2. Pmon does not check ceph-mon status during restart. Otherwise we risk
+   getting into a race condition between the puppet restart and pmon
+   detecting that ceph is down and trying a restart.
+
+Both are resolved when using /etc/init.d/ceph-init-wrapper restart
+
+Signed-off-by: Ovidiu Poncea <Ovidiu.Poncea@windriver.com>
+---
+ manifests/mon.pp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/manifests/mon.pp b/manifests/mon.pp
+index 17cb925..62d5059 100644
+--- a/manifests/mon.pp
++++ b/manifests/mon.pp
+@@ -106,6 +106,7 @@ define ceph::mon (
+         start    => "service ceph start mon.${id}",
+         stop     => "service ceph stop mon.${id}",
+         status   => "service ceph status mon.${id}",
++        restart  => "/etc/init.d/ceph-init-wrapper restart mon.${id}",
+         enable   => $mon_enable,
+       }
+     }
+-- 
+1.8.3.1
+

kubernetes/helm/centos/files/helm-upload

@@ -49,31 +49,4 @@ if [ $REINDEX -eq 1 ]; then
     /usr/sbin/helm repo index $REPO_DIR
 fi
 
-if [ ! -f "/etc/platform/simplex" ]; then
-    # We're not a one node system, copy the files to the other
-    # controller if we can
-    if [ $HOSTNAME == "controller-0" ]; then
-        TARGET="controller-1"
-    else
-        TARGET="controller-0"
-    fi
-
-    # We've modified etc/rsyncd.conf to allow access to /www/helm_charts
-    # To avoid races, copy over the index file last.
-    rsync -acv --exclude=index.yaml ${REPO_DIR}/ rsync://${TARGET}/helm_charts
-    if [ $? -ne 0 ]; then
-        echo Problem syncing helm charts to $TARGET
-        RETVAL=1
-    fi
-
-    rsync -acv ${REPO_DIR}/index.yaml rsync://${TARGET}/helm_charts
-    if [ $? -ne 0 ]; then
-        echo Problem syncing helm chart index file to $TARGET
-        RETVAL=1
-    fi
-fi
-
-# We also need to sync the helm charts on node startup
-# in case they were added while the node was down.
-
 exit $RETVAL

kubernetes/registry-token-server/centos/build_srpm.data

@@ -1,4 +1,12 @@
 TAR_NAME="registry-token-server"
 SRC_DIR="$PKG_BASE/src"
-COPY_LIST="$FILES_BASE/*"
-TIS_PATCH_VER=0
+COPY_LIST=" \
+  $FILES_BASE/* \
+  $STX_BASE/downloads/Sirupsen-logrus-55eb11d21d2a31a3cc93838241d04800f52e823d.tar.gz \
+  $STX_BASE/downloads/docker-distribution-48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89.tar.gz \
+  $STX_BASE/downloads/docker-libtrust-fa567046d9b14f6aa788882a950d69651d230b21.tar.gz \
+  $STX_BASE/downloads/gophercloud-gophercloud-aa00757ee3ab58e53520b6cb910ca0543116400a.tar.gz \
+  $STX_BASE/downloads/gorilla-context-08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz \
+  $STX_BASE/downloads/gorilla-mux-456bcfa82d672db7cae587c9b541463f65bc2718.tar.gz \
+"
+TIS_PATCH_VER=1

kubernetes/registry-token-server/centos/registry-token-server.spec

@@ -11,13 +11,20 @@ Source0:        registry-token-server-%{version}.tar.gz
 Source1:        %{name}.service
 Source2:        token_server.conf
 
+# Go dependencies downloaded as tarballs
+Source10:       Sirupsen-logrus-55eb11d21d2a31a3cc93838241d04800f52e823d.tar.gz
+Source11:       docker-distribution-48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89.tar.gz
+Source12:       docker-libtrust-fa567046d9b14f6aa788882a950d69651d230b21.tar.gz
+Source13:       gophercloud-gophercloud-aa00757ee3ab58e53520b6cb910ca0543116400a.tar.gz
+Source14:       gorilla-context-08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz
+Source15:       gorilla-mux-456bcfa82d672db7cae587c9b541463f65bc2718.tar.gz
+
 BuildRequires: systemd
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 
 BuildRequires:  golang >= 1.6
-BuildRequires:  golang-dep
 ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
 
 %description
@@ -26,13 +33,26 @@ ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
 %prep
 %setup -q -n registry-token-server-%{version}
 
+# Extract other go dependencies
+%setup -T -D -a 10
+%setup -T -D -a 11
+%setup -T -D -a 12
+%setup -T -D -a 13
+%setup -T -D -a 14
+%setup -T -D -a 15
+mkdir -p _build/src/github.com/gorilla/ && mv gorilla-mux _build/src/github.com/gorilla/mux
+mkdir -p _build/src/github.com/docker/ && mv docker-distribution _build/src/github.com/docker/distribution
+mkdir -p _build/src/github.com/docker/ && mv docker-libtrust _build/src/github.com/docker/libtrust
+mkdir -p _build/src/github.com/docker/distribution/ && mv gorilla-context _build/src/github.com/docker/distribution/context
+mkdir -p _build/src/github.com/Sirupsen/ && mv Sirupsen-logrus _build/src/github.com/Sirupsen/logrus
+mkdir -p _build/src/github.com/gophercloud && mv gophercloud-gophercloud _build/src/github.com/gophercloud/gophercloud
+
 %build
 mkdir -p ./_build/src/
 ln -s $(pwd) ./_build/src/registry-token-server
 export GOPATH=$(pwd)/_build:%{gopath}
 
 cd ./_build/src/registry-token-server
-dep ensure
 %gobuild -o bin/registry-token-server registry-token-server
 
 %install

monitoring/collectd-extensions/centos/build_srpm.data

@@ -16,4 +16,4 @@ COPY_LIST="$PKG_BASE/src/LICENSE \
   $PKG_BASE/src/example.py \
   $PKG_BASE/src/example.conf"
 
-TIS_PATCH_VER=5
+TIS_PATCH_VER=6

monitoring/collectd-extensions/src/ntpq.py

@@ -222,7 +222,6 @@ def _raise_alarm(ip=None):
 def _clear_base_alarm():
     """ Clear the NTP base alarm """
 
-    if api.get_fault(PLUGIN_ALARMID, obj.base_eid) is not None:
     if api.clear_fault(PLUGIN_ALARMID, obj.base_eid) is False:
         collectd.error("%s failed to clear alarm %s:%s" %
                        (PLUGIN, PLUGIN_ALARMID, obj.base_eid))
@@ -263,8 +262,8 @@ def _remove_ip_from_unreachable_list(ip):
     if ip and ip in obj.unreachable_servers:
         eid = obj.base_eid + '=' + ip
         collectd.debug("%s trying to clear alarm %s" % (PLUGIN, eid))
+
         # clear the alarm if its asserted
-        if api.get_fault(PLUGIN_ALARMID, eid) is not None:
         if api.clear_fault(PLUGIN_ALARMID, eid) is True:
             collectd.info("%s cleared %s:%s alarm" %
                           (PLUGIN, PLUGIN_ALARMID, eid))
@@ -277,9 +276,6 @@ def _remove_ip_from_unreachable_list(ip):
             collectd.error("%s failed alarm clear %s:%s" %
                            (PLUGIN, PLUGIN_ALARMID, eid))
             return True
-        else:
-            obj.unreachable_servers.remove(ip)
-            collectd.info("%s alarm %s not raised" % (PLUGIN, eid))
 
     return False