Remove enable_(mistral|zaqar) options
Disabling either of these features is going to result in a useless undercloud now, so there's no point exposing them as options. Change-Id: I2c54ec066fcc321fefe473038631efe9ced61936
This commit is contained in:
parent
74223b7a84
commit
e465ca4e70
|
@ -527,34 +527,32 @@ if str2bool(hiera('enable_docker_registry', true)) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if str2bool(hiera('enable_mistral', true)) {
|
include ::mistral
|
||||||
include ::mistral
|
$mistral_dsn = split(hiera('mistral::database_connection'), '[@:/?]')
|
||||||
$mistral_dsn = split(hiera('mistral::database_connection'), '[@:/?]')
|
class { '::mistral::db::mysql':
|
||||||
class { '::mistral::db::mysql':
|
user => $mistral_dsn[3],
|
||||||
user => $mistral_dsn[3],
|
password => $mistral_dsn[4],
|
||||||
password => $mistral_dsn[4],
|
host => $mistral_dsn[5],
|
||||||
host => $mistral_dsn[5],
|
dbname => $mistral_dsn[6],
|
||||||
dbname => $mistral_dsn[6],
|
allowed_hosts => $allowed_hosts,
|
||||||
allowed_hosts => $allowed_hosts,
|
|
||||||
}
|
|
||||||
include ::mistral::keystone::auth
|
|
||||||
include ::mistral::db::sync
|
|
||||||
include ::mistral::api
|
|
||||||
include ::mistral::engine
|
|
||||||
include ::mistral::executor
|
|
||||||
include ::mistral::cors
|
|
||||||
|
|
||||||
# ensure TripleO common entrypoints for custom Mistral actions
|
|
||||||
# are installed before performing the Mistral action population
|
|
||||||
package {'openstack-tripleo-common': }
|
|
||||||
Package['openstack-tripleo-common'] ~> Exec['mistral-db-populate']
|
|
||||||
# If ironic inspector is not running, mistral-db-populate will have invalid
|
|
||||||
# actions for it.
|
|
||||||
Class['::ironic::inspector'] ~> Exec['mistral-db-populate']
|
|
||||||
# db-populate calls inspectorclient, which will use the keystone endpoint to
|
|
||||||
# check inspector's version. So that's needed before db-populate is executed.
|
|
||||||
Class['::ironic::keystone::auth_inspector'] ~> Exec['mistral-db-populate']
|
|
||||||
}
|
}
|
||||||
|
include ::mistral::keystone::auth
|
||||||
|
include ::mistral::db::sync
|
||||||
|
include ::mistral::api
|
||||||
|
include ::mistral::engine
|
||||||
|
include ::mistral::executor
|
||||||
|
include ::mistral::cors
|
||||||
|
|
||||||
|
# ensure TripleO common entrypoints for custom Mistral actions
|
||||||
|
# are installed before performing the Mistral action population
|
||||||
|
package {'openstack-tripleo-common': }
|
||||||
|
Package['openstack-tripleo-common'] ~> Exec['mistral-db-populate']
|
||||||
|
# If ironic inspector is not running, mistral-db-populate will have invalid
|
||||||
|
# actions for it.
|
||||||
|
Class['::ironic::inspector'] ~> Exec['mistral-db-populate']
|
||||||
|
# db-populate calls inspectorclient, which will use the keystone endpoint to
|
||||||
|
# check inspector's version. So that's needed before db-populate is executed.
|
||||||
|
Class['::ironic::keystone::auth_inspector'] ~> Exec['mistral-db-populate']
|
||||||
|
|
||||||
if str2bool(hiera('enable_ui', true)) {
|
if str2bool(hiera('enable_ui', true)) {
|
||||||
include ::tripleo::profile::base::ui
|
include ::tripleo::profile::base::ui
|
||||||
|
@ -564,23 +562,21 @@ if str2bool(hiera('enable_validations', true)) {
|
||||||
include ::tripleo::profile::base::validations
|
include ::tripleo::profile::base::validations
|
||||||
}
|
}
|
||||||
|
|
||||||
if str2bool(hiera('enable_zaqar', true)) {
|
include ::mongodb::globals
|
||||||
include ::mongodb::globals
|
include ::mongodb::server
|
||||||
include ::mongodb::server
|
include ::mongodb::client
|
||||||
include ::mongodb::client
|
|
||||||
|
|
||||||
include ::zaqar
|
include ::zaqar
|
||||||
include ::zaqar::management::mongodb
|
include ::zaqar::management::mongodb
|
||||||
include ::zaqar::messaging::mongodb
|
include ::zaqar::messaging::mongodb
|
||||||
include ::zaqar::keystone::auth
|
include ::zaqar::keystone::auth
|
||||||
include ::zaqar::keystone::auth_websocket
|
include ::zaqar::keystone::auth_websocket
|
||||||
include ::zaqar::transport::websocket
|
include ::zaqar::transport::websocket
|
||||||
include ::zaqar::transport::wsgi
|
include ::zaqar::transport::wsgi
|
||||||
|
|
||||||
include ::zaqar::server
|
include ::zaqar::server
|
||||||
zaqar::server_instance{ '1':
|
zaqar::server_instance{ '1':
|
||||||
transport => 'websocket'
|
transport => 'websocket'
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if str2bool(hiera('enable_cinder', true)) {
|
if str2bool(hiera('enable_cinder', true)) {
|
||||||
|
|
|
@ -666,9 +666,9 @@ tripleo::haproxy::panko: "%{hiera('enable_telemetry')}"
|
||||||
tripleo::haproxy::ironic: true
|
tripleo::haproxy::ironic: true
|
||||||
tripleo::haproxy::ironic_inspector: true
|
tripleo::haproxy::ironic_inspector: true
|
||||||
tripleo::haproxy::rabbitmq: true
|
tripleo::haproxy::rabbitmq: true
|
||||||
tripleo::haproxy::mistral: {{ENABLE_MISTRAL}}
|
tripleo::haproxy::mistral: true
|
||||||
tripleo::haproxy::zaqar_api: {{ENABLE_ZAQAR}}
|
tripleo::haproxy::zaqar_api: true
|
||||||
tripleo::haproxy::zaqar_ws: {{ENABLE_ZAQAR}}
|
tripleo::haproxy::zaqar_ws: true
|
||||||
tripleo::haproxy::docker_registry: true
|
tripleo::haproxy::docker_registry: true
|
||||||
|
|
||||||
# Keepalived
|
# Keepalived
|
||||||
|
@ -709,8 +709,6 @@ mistral::keystone_tenant: 'service'
|
||||||
swift::proxy::workers: "%{::os_workers}"
|
swift::proxy::workers: "%{::os_workers}"
|
||||||
# Options
|
# Options
|
||||||
enable_tempest: {{ENABLE_TEMPEST}}
|
enable_tempest: {{ENABLE_TEMPEST}}
|
||||||
enable_mistral: {{ENABLE_MISTRAL}}
|
|
||||||
enable_zaqar: {{ENABLE_ZAQAR}}
|
|
||||||
enable_validations: {{ENABLE_VALIDATIONS}}
|
enable_validations: {{ENABLE_VALIDATIONS}}
|
||||||
enable_telemetry: {{ENABLE_TELEMETRY}}
|
enable_telemetry: {{ENABLE_TELEMETRY}}
|
||||||
enable_legacy_ceilometer_api: {{ENABLE_LEGACY_CEILOMETER_API}}
|
enable_legacy_ceilometer_api: {{ENABLE_LEGACY_CEILOMETER_API}}
|
||||||
|
|
|
@ -99,18 +99,16 @@ openstack quota set --cores -1 --instances -1 --ram -1 $(openstack project show
|
||||||
# instack-prepare-for-overcloud
|
# instack-prepare-for-overcloud
|
||||||
rm -rf $HOME/.novaclient
|
rm -rf $HOME/.novaclient
|
||||||
|
|
||||||
if [ "$(hiera enable_mistral)" = "true" ]; then
|
# load workflows
|
||||||
# load workflows
|
for workbook in $(mistral workbook-list | grep tripleo | cut -f 2 -d ' '); do
|
||||||
for workbook in $(mistral workbook-list | grep tripleo | cut -f 2 -d ' '); do
|
mistral workbook-delete $workbook
|
||||||
mistral workbook-delete $workbook
|
done
|
||||||
done
|
for workflow in $(mistral workflow-list | grep tripleo | cut -f 2 -d ' '); do
|
||||||
for workflow in $(mistral workflow-list | grep tripleo | cut -f 2 -d ' '); do
|
mistral workflow-delete $workflow
|
||||||
mistral workflow-delete $workflow
|
done
|
||||||
done
|
for workbook in $(ls /usr/share/openstack-tripleo-common/workbooks/*); do
|
||||||
for workbook in $(ls /usr/share/openstack-tripleo-common/workbooks/*); do
|
mistral workbook-create $workbook
|
||||||
mistral workbook-create $workbook
|
done
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# IP forwarding is needed to allow the overcloud nodes access to the outside
|
# IP forwarding is needed to allow the overcloud nodes access to the outside
|
||||||
# internet in cases where they are on an isolated network.
|
# internet in cases where they are on an isolated network.
|
||||||
|
|
|
@ -279,14 +279,6 @@ _opts = [
|
||||||
default=True,
|
default=True,
|
||||||
help=('Whether to install Tempest in the Undercloud.')
|
help=('Whether to install Tempest in the Undercloud.')
|
||||||
),
|
),
|
||||||
cfg.BoolOpt('enable_mistral',
|
|
||||||
default=True,
|
|
||||||
help=('Whether to install Mistral services in the Undercloud.')
|
|
||||||
),
|
|
||||||
cfg.BoolOpt('enable_zaqar',
|
|
||||||
default=True,
|
|
||||||
help=('Whether to install Zaqar services in the Undercloud.')
|
|
||||||
),
|
|
||||||
cfg.BoolOpt('enable_telemetry',
|
cfg.BoolOpt('enable_telemetry',
|
||||||
default=True,
|
default=True,
|
||||||
help=('Whether to install Telemetry services '
|
help=('Whether to install Telemetry services '
|
||||||
|
@ -1225,15 +1217,14 @@ def _post_config(instack_env):
|
||||||
_ensure_flavor(nova, 'block-storage', 'block-storage')
|
_ensure_flavor(nova, 'block-storage', 'block-storage')
|
||||||
_ensure_flavor(nova, 'swift-storage', 'swift-storage')
|
_ensure_flavor(nova, 'swift-storage', 'swift-storage')
|
||||||
|
|
||||||
if CONF.enable_mistral:
|
mistral_url = instack_env['UNDERCLOUD_ENDPOINT_MISTRAL_PUBLIC']
|
||||||
mistral_url = instack_env['UNDERCLOUD_ENDPOINT_MISTRAL_PUBLIC']
|
mistral = mistralclient.client(
|
||||||
mistral = mistralclient.client(
|
mistral_url=mistral_url,
|
||||||
mistral_url=mistral_url,
|
username=user,
|
||||||
username=user,
|
api_key=password,
|
||||||
api_key=password,
|
project_name=tenant,
|
||||||
project_name=tenant,
|
auth_url=auth_url)
|
||||||
auth_url=auth_url)
|
_post_config_mistral(instack_env, mistral)
|
||||||
_post_config_mistral(instack_env, mistral)
|
|
||||||
|
|
||||||
|
|
||||||
def _handle_upgrade_fact(upgrade=False):
|
def _handle_upgrade_fact(upgrade=False):
|
||||||
|
|
|
@ -139,14 +139,7 @@
|
||||||
# Whether to install Tempest in the Undercloud. (boolean value)
|
# Whether to install Tempest in the Undercloud. (boolean value)
|
||||||
#enable_tempest = true
|
#enable_tempest = true
|
||||||
|
|
||||||
# Whether to install Mistral services in the Undercloud. (boolean
|
# Whether to install Telemetry services (ceilometer, aodh) in the
|
||||||
# value)
|
|
||||||
#enable_mistral = true
|
|
||||||
|
|
||||||
# Whether to install Zaqar services in the Undercloud. (boolean value)
|
|
||||||
#enable_zaqar = true
|
|
||||||
|
|
||||||
# Whether to install Telemetry services (ceilometer, aodh, gnocchi, panko) in the
|
|
||||||
# Undercloud. (boolean value)
|
# Undercloud. (boolean value)
|
||||||
#enable_telemetry = true
|
#enable_telemetry = true
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue