From f95912e1b9d1c48f4cf893c3560d409920ed0b5b Mon Sep 17 00:00:00 2001 From: Tetiana Lashchova Date: Fri, 13 May 2016 16:49:09 +0300 Subject: [PATCH] Change chef installation method Fedora and Centos don't have chef in their repos. So we need to install it in another way. This patch adds an ability to install chef in different ways depending on a used distro (ubuntu, fedora, centos7) Change-Id: I1a8ea048791cc0498e78c6a406ef9b486d213471 Related-Bug: #1578991 --- contrib/elements/murano-agent/install.d/74-murano-agent | 9 ++++++++- releasenotes/notes/install-chef-d67f115c0958c116.yaml | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/install-chef-d67f115c0958c116.yaml diff --git a/contrib/elements/murano-agent/install.d/74-murano-agent b/contrib/elements/murano-agent/install.d/74-murano-agent index b81542d7..14b145b9 100755 --- a/contrib/elements/murano-agent/install.d/74-murano-agent +++ b/contrib/elements/murano-agent/install.d/74-murano-agent @@ -2,7 +2,14 @@ set -eu -install-packages git-core wget make gcc python-pip python-dev python-setuptools chef puppet +install-packages git-core wget make gcc python-pip python-dev python-setuptools puppet + +if test -f /etc/redhat-release +then + rpm -Uvh https://packages.chef.io/stable/el/7/chef-12.9.41-1.el7.x86_64.rpm +else + install-packages chef +fi name=murano-agent svc_root=${DIB_MURANO_AGENT_SVC_ROOT:-/opt/stack/$name} diff --git a/releasenotes/notes/install-chef-d67f115c0958c116.yaml b/releasenotes/notes/install-chef-d67f115c0958c116.yaml new file mode 100644 index 00000000..2681c5a6 --- /dev/null +++ b/releasenotes/notes/install-chef-d67f115c0958c116.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - Elements were updated to allow building murano fedora images with chef installed. + Chef is installed from https://packages.chef.io \ No newline at end of file