Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E5782200B6F for ; Wed, 24 Aug 2016 09:34:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E3E73160AC1; Wed, 24 Aug 2016 07:34:27 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 37A04160AA4 for ; Wed, 24 Aug 2016 09:34:27 +0200 (CEST) Received: (qmail 14714 invoked by uid 500); 24 Aug 2016 07:34:21 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 14478 invoked by uid 99); 24 Aug 2016 07:34:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2016 07:34:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 38D93E05E1; Wed, 24 Aug 2016 07:34:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Wed, 24 Aug 2016 07:34:22 -0000 Message-Id: In-Reply-To: <61c3a9c7107f4a50883177d6a216b1ce@git.apache.org> References: <61c3a9c7107f4a50883177d6a216b1ce@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.8 to 19f159a archived-at: Wed, 24 Aug 2016 07:34:28 -0000 Merge pull request #1657 from shapeblue/4.8-usageserverfix [lts/blocker] CLOUDSTACK-9467: Add symlink to key file for usage serverOn fresh installation, the usage server fails to start if the `key` file does not exist in its classpath. The issue is reproducible in environments (such as Trillian) where the usage server is installed before cloudstack-setup-databases has been called. Before the cloudstack db has been setup, the key file does not exist at its default location and installation of usage-server fails to add a symlink to the key file. This fix adds a default symlink to `/etc/cloudstack/management/key` if a symlink/file does not already exist in the /etc/cloudstack/usage directory. On new installation, in the post-installation steps it checks if the symlink or file exists, and adds a symlink if it does not exist. On existing installations, if symlink or file exists then it will skip adding symlink. /cc @jburwell @PaulAngus @karuturi @blueorangutan package * pr/1657: CLOUDSTACK-9467: Add symlink to key file for usage server Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/19f159a9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/19f159a9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/19f159a9 Branch: refs/heads/4.8 Commit: 19f159a96b0a565f1a70cdd745a6f2ca0c35207c Parents: 3fa8762 8cd44b1 Author: Rohit Yadav Authored: Wed Aug 24 13:04:02 2016 +0530 Committer: Rohit Yadav Committed: Wed Aug 24 13:04:02 2016 +0530 ---------------------------------------------------------------------- packaging/centos63/cloud.spec | 4 ++++ packaging/centos7/cloud.spec | 4 ++++ 2 files changed, 8 insertions(+) ----------------------------------------------------------------------