openstack
/
fuel-library
Code Issues Proposed changes

Remove murano apps import 

This functionality will be moved to python-muranoclient
Also obsolete 'io.murano.lib.networks.Neutron' was removed

Change-Id: I7d99b7430dc74d780d831467121a23d213978333
Closes-Bug: #1433083
This commit is contained in:
Ekaterina Chernova 2015-03-17 19:04:16 +03:00
parent 0917485338
commit 4bc612f1b8
3 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/puppet/murano/manifests/api.pp
View File

@ -165,9 +165,6 @@ class murano::api (
murano::application_package{'io.murano':
mandatory => true
}
murano::application_package{'io.murano.lib.networks.Neutron':
mandatory => true
}
Exec['murano_manage_db_sync'] -> Murano::Application_package<| mandatory == true |>
}

44
deployment/puppet/murano/manifests/apps.pp
View File

@ -1,44 +0,0 @@
class murano::apps (
$primary_controller = true,
) {
package { 'murano-apps':
ensure => installed,
name => $::murano::params::murano_apps_package_name,
}
if $primary_controller {
murano::application_package { 'io.murano.databases.PostgreSql':
package_category => 'Databases',
}
murano::application_package { 'io.murano.databases.MySql':
package_category => 'Databases',
}
murano::application_package { 'io.murano.databases.SqlDatabase':
package_category => 'Databases',
}
murano::application_package { 'io.murano.apps.apache.ApacheHttpServer':
package_category => 'Web',
}
murano::application_package { 'io.murano.apps.apache.Tomcat':
package_category => 'Web',
}
murano::application_package { 'io.murano.apps.WordPress':
package_category => 'Application Servers',
}
murano::application_package { 'io.murano.apps.ZabbixAgent':
package_category => 'Application Servers',
}
murano::application_package { 'io.murano.apps.ZabbixServer':
package_category => 'Application Servers',
}
Package<| title == 'murano-apps'|> -> Murano::Application_package<| mandatory == false |>
}
}

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

@ -62,7 +62,7 @@ class murano (
$external_network = 'net04_ext',
) {
Class['mysql::server'] -> Class['murano::db::mysql'] -> Class['murano::murano_rabbitmq'] -> Class['murano::keystone'] -> Class['murano::python_muranoclient'] -> Class['murano::api'] -> Class['murano::apps'] -> Class['murano::dashboard'] -> Class['murano::cirros']
Class['mysql::server'] -> Class['murano::db::mysql'] -> Class['murano::murano_rabbitmq'] -> Class['murano::keystone'] -> Class['murano::python_muranoclient'] -> Class['murano::api'] -> Class['murano::dashboard'] -> Class['murano::cirros']
User['murano'] -> Class['murano::api'] -> File <| title == $murano_log_dir |>
@ -157,10 +157,6 @@ class murano (
external_network => $external_network,
}
class { 'murano::apps':
primary_controller => $primary_controller,
}
class { 'murano::dashboard' :
settings_py => '/usr/share/openstack-dashboard/openstack_dashboard/settings.py',
}