d353dacf8e
* Add forgotten return statements
Closes-bug: #1268934
* Fix error code when there is no input json
* Return correct http code
During toggle enabled 500 was sent in case service is not defined
Fix return code to 404
Closes-Bug: #1268976
* Remove need to specify IP for load balancer
Implements:
https://blueprints.launchpad.net/murano/+spec/auto-assign-virtual-ip
Address blueprint auto-assign-virtual-ip
Fix errors in infrastructure
1) Update path to config file
2) Update sample config - remove non-existing directory
3) Add 0.4.1 version
Fixes-Bug: 1270734
* Add new setup and SysV scripts
* Removed SysV EL6 standalone file, removed old setup scripts
* Add correct error message when no config specified
Closes-Bug: 1271092
* Security rules updated
* incorrect port ranges for ADDS fixed according to
http://technet.microsoft.com/en-us/library/dd772723%28v=WS.10%29.aspx
* security template for Windows Server Failover Cluster added according to
http://support.microsoft.com/kb/832017#method5
* security rules for SQL Server updated according to
http://technet.microsoft.com/en-us/library/cc646023.aspx
Relates-Bug: 1264088
* Typo fixed
* Revert change
This reverts commit d87bc2309f.
* Path flattening is reverted, but opening ports for WinRM 2.0 is kept.
Related-Bug: #1271578
* Fix paths to scripts used by MS SQL Cluster templates.
Partial-Bug: #1271578
* Fix returning list of files in nested dirs - don't cut first symbol.
* And fix a minor PyCharm warning about var not being initialized.
Closes-Bug: #1274851
* Add checkbox to enable floating IP auto assignment
* Implements blueprint auto-assign-floating-ip
* Fixed typo in conductor workflow
Closes-Bug: 1264250
* Add service version during service creation
Closes-Bug: 1269360
* Resolve issue with KeyPair assignment
nvironment with a service with Key Pair assigned
could not be deployed due to invalid match in workflows
causing invalid Heat template to be produced by Conductor.
Closes-bug: #1274011
* Correct inform message during floating ip creation
* Fix name for syslog_log_facility param
Change-Id: Id3ad4581cd9ce40a569ac580d0aee8db017855c4
68 lines
2.2 KiB
Python
68 lines
2.2 KiB
Python
# Copyright (c) 2013 Mirantis Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
from oslo.config import cfg
|
|
from muranorepository.openstack.common import log
|
|
from muranorepository.consts import *
|
|
|
|
server_opts = [
|
|
cfg.StrOpt('host', default='127.0.0.1'),
|
|
cfg.IntOpt('port', default=5000)
|
|
]
|
|
|
|
cache_opt = cfg.StrOpt('data_dir')
|
|
|
|
keystone_opts = [
|
|
cfg.StrOpt('auth_host', default='localhost'),
|
|
cfg.IntOpt('auth_port', default=5000),
|
|
cfg.StrOpt('auth_protocol', default='http'),
|
|
cfg.StrOpt('admin_user', default='admin'),
|
|
cfg.StrOpt('admin_password', default=None),
|
|
cfg.StrOpt('admin_tenant_name', default='admin'),
|
|
cfg.StrOpt('signing_dir', default='/tmp/keystone-muranorepository')
|
|
]
|
|
|
|
type_dirs_opts = [cfg.StrOpt(x) for x in DATA_TYPES]
|
|
|
|
|
|
cfg.set_defaults(log.log_opts,
|
|
default_log_levels=['qpid.messaging=INFO',
|
|
'keystoneclient=INFO',
|
|
'eventlet.wsgi.server=WARN'])
|
|
CONF = cfg.CONF
|
|
CONF.register_cli_opts(server_opts)
|
|
CONF.register_opts(type_dirs_opts)
|
|
CONF.register_opts(type_dirs_opts, group='output')
|
|
CONF.register_opts(keystone_opts, group='keystone')
|
|
CONF.register_opt(cache_opt)
|
|
|
|
ARGV = []
|
|
|
|
cfg.set_defaults(log.log_opts, default_log_levels=[
|
|
'iso8601=WARN',
|
|
'keystoneclient=WARN'
|
|
])
|
|
|
|
|
|
def parse_configs(argv=None, conf_files=None):
|
|
if argv is not None:
|
|
global ARGV
|
|
ARGV = argv
|
|
try:
|
|
CONF(ARGV, project='murano-repository', version='0.4.1',
|
|
default_config_files=conf_files)
|
|
except cfg.RequiredOptError as roe:
|
|
raise RuntimeError("Option '%s' is required for config group "
|
|
"'%s'" % (roe.opt_name, roe.group.name))
|