openstack/fuel-library
Code Issues Proposed changes

Rename package murano-api to murano

Browse Source 
Added backward compatibility logic to murano
to enable Icehouse deployment, but depends on
setting openstack_version to 2014.1.X-6.0

blueprint fuel-deploy-juno

Co-Authored-By: Dmitry Borodaenko <dborodaenko@mirantis.com>
Change-Id: I5b7f314c3e9ff8fd34c4e2a7044e282b55ee6b7c
This commit is contained in:
Matthew Mosesohn 2014-10-06 16:45:37 +04:00 committed by Dmitry Borodaenko
parent e43e9ba98f
commit c41b399fb1
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/murano/manifests/init.pp
View File

@ -1,4 +1,6 @@
class murano (
# package
$murano_package_name = 'murano',
# keystone
$murano_keystone_host = '127.0.0.1',
$murano_keystone_port = '5000',

2
deployment/puppet/murano/manifests/params.pp
View File

@ -1,7 +1,7 @@
class murano::params {
# package names
$murano_package_name = 'murano-api'
$murano_package_name = $::murano::murano_package_name
$murano_apps_package_name = 'murano-apps'
$murano_dashboard_package_name = 'murano-dashboard'
$python_muranoclient_package_name = 'python-muranoclient'

14
deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
View File

@ -594,7 +594,21 @@ class osnailyfacter::cluster_ha {
if $murano_hash['enabled'] {
#NOTE(mattymo): Backward compatibility for Icehouse
case $::fuel_settings['openstack_version'] {
/201[1-3]\./: {
fail("Unsupported OpenStack version: ${::fuel_settings['openstack_version']}")
}
/2014\.1\./: {
$murano_package_name = 'murano-api'
}
default: {
$murano_package_name = 'murano'
}
}
class { 'murano' :
murano_package_name => $murano_package_name,
murano_api_host => $::fuel_settings['management_vip'],
# Murano uses two RabbitMQ - one from OpenStack and another one installed on each controller.