openstack
/
murano-agent
Code Issues Proposed changes

Merge "Change chef installation method"

This commit is contained in:
Jenkins 2016-06-20 12:02:03 +00:00 committed by Gerrit Code Review
parent 029a2a17d7 f95912e1b9
commit 71c46bdb6a
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/elements/murano-agent/install.d/74-murano-agent
View File

@ -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}

4
releasenotes/notes/install-chef-d67f115c0958c116.yaml Normal file
View File

@ -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