154 lines
5.2 KiB
Diff
154 lines
5.2 KiB
Diff
From 23266d5d4ce487895635fea4e919c9b1490d44d6 Mon Sep 17 00:00:00 2001
|
|
From: Jerry Sun <jerry.sun@windriver.com>
|
|
Date: Wed, 29 Nov 2017 12:45:05 -0500
|
|
Subject: [PATCH 1/1] Pike Rebase
|
|
|
|
---
|
|
manifests/dashboard.pp | 37 -------------------------------------
|
|
manifests/init.pp | 12 ++++++++++++
|
|
manifests/params.pp | 4 ++--
|
|
3 files changed, 14 insertions(+), 39 deletions(-)
|
|
|
|
diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp
|
|
index 8668cec..7c879d9 100644
|
|
--- a/manifests/dashboard.pp
|
|
+++ b/manifests/dashboard.pp
|
|
@@ -72,26 +72,6 @@ class murano::dashboard(
|
|
tag => ['openstack', 'murano-packages'],
|
|
}
|
|
|
|
- concat { $::murano::params::local_settings_path: }
|
|
-
|
|
- concat::fragment { 'original_config':
|
|
- target => $::murano::params::local_settings_path,
|
|
- source => $::murano::params::local_settings_path,
|
|
- order => 1,
|
|
- }
|
|
-
|
|
- concat::fragment { 'murano_dashboard_section':
|
|
- target => $::murano::params::local_settings_path,
|
|
- content => template('murano/local_settings.py.erb'),
|
|
- order => 2,
|
|
- }
|
|
-
|
|
- exec { 'clean_horizon_config':
|
|
- command => "sed -e '/^## MURANO_CONFIG_BEGIN/,/^## MURANO_CONFIG_END ##/ d' -i ${::murano::params::local_settings_path}",
|
|
- onlyif => "grep '^## MURANO_CONFIG_BEGIN' ${::murano::params::local_settings_path}",
|
|
- path => [ '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/' ],
|
|
- }
|
|
-
|
|
if $::os_package_type == 'ubuntu' {
|
|
$collect_static_command = "${collect_static_script} collectstatic --noinput"
|
|
} else {
|
|
@@ -100,29 +80,17 @@ class murano::dashboard(
|
|
|
|
exec { 'django_collectstatic':
|
|
command => $collect_static_command,
|
|
- environment => [
|
|
- "APACHE_USER=${::apache::params::user}",
|
|
- "APACHE_GROUP=${::apache::params::group}",
|
|
- ],
|
|
refreshonly => true,
|
|
}
|
|
|
|
exec { 'django_compressstatic':
|
|
command => "${collect_static_script} compress --force",
|
|
- environment => [
|
|
- "APACHE_USER=${::apache::params::user}",
|
|
- "APACHE_GROUP=${::apache::params::group}",
|
|
- ],
|
|
refreshonly => true,
|
|
}
|
|
|
|
if $sync_db {
|
|
exec { 'django_syncdb':
|
|
command => "${collect_static_script} migrate --noinput",
|
|
- environment => [
|
|
- "APACHE_USER=${::apache::params::user}",
|
|
- "APACHE_GROUP=${::apache::params::group}",
|
|
- ],
|
|
refreshonly => true,
|
|
}
|
|
|
|
@@ -132,11 +100,6 @@ class murano::dashboard(
|
|
}
|
|
|
|
Package['murano-dashboard']
|
|
- -> Exec['clean_horizon_config']
|
|
- -> Concat[$::murano::params::local_settings_path]
|
|
- -> Service <| title == 'httpd' |>
|
|
-
|
|
- Package['murano-dashboard']
|
|
~> Exec['django_collectstatic']
|
|
~> Exec['django_compressstatic']
|
|
~> Service <| title == 'httpd' |>
|
|
diff --git a/manifests/init.pp b/manifests/init.pp
|
|
index 1cc27cc..54ddd50 100644
|
|
--- a/manifests/init.pp
|
|
+++ b/manifests/init.pp
|
|
@@ -275,6 +275,13 @@
|
|
# (optional) The RabbitMQ virtual host.
|
|
# Defaults to $::os_service_default
|
|
#
|
|
+# === WRS addons
|
|
+# [disable_murano_agent]
|
|
+# (Optional) disable the use of murano agent
|
|
+#
|
|
+# [api_workers]
|
|
+# number of api workers
|
|
+#
|
|
class murano(
|
|
$admin_password,
|
|
$package_ensure = 'present',
|
|
@@ -331,6 +338,9 @@ class murano(
|
|
$auth_uri = 'http://127.0.0.1:5000',
|
|
$memcached_servers = $::os_service_default,
|
|
$purge_config = false,
|
|
+ # WRS
|
|
+ $disable_murano_agent = true,
|
|
+ $api_workers = $::os_service_default,
|
|
# Deprecated
|
|
$identity_uri = 'http://127.0.0.1:35357/',
|
|
$rabbit_os_host = $::os_service_default,
|
|
@@ -410,6 +420,7 @@ deprecated. Please use murano::default_transport_url instead.")
|
|
|
|
murano_config {
|
|
'murano/url' : value => "${service_protocol}://${service_host}:${service_port}";
|
|
+ 'murano/api_workers' : value => $api_workers;
|
|
|
|
'engine/use_trusts' : value => $use_trusts;
|
|
|
|
@@ -430,6 +441,7 @@ deprecated. Please use murano::default_transport_url instead.")
|
|
|
|
'networking/default_dns': value => $default_nameservers;
|
|
|
|
+ 'engine/disable_murano_agent': value => $disable_murano_agent;
|
|
'engine/packages_service': value => $packages_service,
|
|
}
|
|
|
|
diff --git a/manifests/params.pp b/manifests/params.pp
|
|
index b3eca3f..cf606f0 100644
|
|
--- a/manifests/params.pp
|
|
+++ b/manifests/params.pp
|
|
@@ -20,7 +20,7 @@ class murano::params {
|
|
$common_package_name = 'openstack-murano-common'
|
|
$engine_package_name = 'openstack-murano-engine'
|
|
$pythonclient_package_name = 'python-muranoclient'
|
|
- $dashboard_package_name = 'openstack-murano-dashboard'
|
|
+ $dashboard_package_name = 'openstack-murano-ui'
|
|
# service names
|
|
$cfapi_service_name = 'murano-cf-api'
|
|
# dashboard config file
|
|
@@ -33,7 +33,7 @@ class murano::params {
|
|
$common_package_name = 'murano-common'
|
|
$engine_package_name = 'murano-engine'
|
|
$pythonclient_package_name = 'python-muranoclient'
|
|
- $dashboard_package_name = 'python-murano-dashboard'
|
|
+ $dashboard_package_name = 'python-murano-ui'
|
|
# service names
|
|
$cfapi_service_name = 'murano-cfapi'
|
|
# dashboard config file
|
|
--
|
|
1.8.3.1
|
|
|