diff --git a/deployment/puppet/murano/manifests/api.pp b/deployment/puppet/murano/manifests/api.pp index 3c113c722f..7858380e72 100644 --- a/deployment/puppet/murano/manifests/api.pp +++ b/deployment/puppet/murano/manifests/api.pp @@ -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 |> } diff --git a/deployment/puppet/murano/manifests/apps.pp b/deployment/puppet/murano/manifests/apps.pp deleted file mode 100644 index 7068635d5f..0000000000 --- a/deployment/puppet/murano/manifests/apps.pp +++ /dev/null @@ -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 |> - } - } diff --git a/deployment/puppet/murano/manifests/init.pp b/deployment/puppet/murano/manifests/init.pp index c848dbd398..bdbedb30c8 100644 --- a/deployment/puppet/murano/manifests/init.pp +++ b/deployment/puppet/murano/manifests/init.pp @@ -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', }