Fix settings for Newton release
- The keystone_default_domain must be the ID of the domain and not its name. - The comment for the CACHES setting was updated upstream. - The FLAVOR_EXTRA_KEYS setting got deprecated, so we drop it. Change-Id: I8930e36883b64fa823438289e26602ea243f7fe6
This commit is contained in:
parent
bc49cefc80
commit
e49a768f62
|
@ -173,6 +173,7 @@ default['openstack']['dashboard']['csrf_cookie_secure'] = true
|
|||
default['openstack']['dashboard']['session_cookie_secure'] = true
|
||||
|
||||
default['openstack']['dashboard']['keystone_multidomain_support'] = false
|
||||
default['openstack']['dashboard']['keystone_default_domain'] = 'default'
|
||||
default['openstack']['dashboard']['api']['auth']['version'] = node['openstack']['api']['auth']['version']
|
||||
|
||||
case node['openstack']['dashboard']['api']['auth']['version']
|
||||
|
@ -183,7 +184,6 @@ when 'v3.0'
|
|||
end
|
||||
|
||||
default['openstack']['dashboard']['volume_api_version'] = 2
|
||||
default['openstack']['dashboard']['keystone_default_domain'] = 'Default'
|
||||
default['openstack']['dashboard']['console_type'] = 'AUTO'
|
||||
|
||||
default['openstack']['dashboard']['keystone_backend']['name'] = 'native'
|
||||
|
|
|
@ -61,9 +61,13 @@ OPENSTACK_API_VERSIONS = {
|
|||
# will require user to enter the Domain name in addition to username for login.
|
||||
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = <%= node["openstack"]["dashboard"]["keystone_multidomain_support"] ? "True" : "False" %>
|
||||
|
||||
<% if node["openstack"]["dashboard"]["identity_api_version"] == 3 %>
|
||||
# Overrides the default domain used when running on single-domain model
|
||||
# with Keystone V3. All entities will be created in the default domain.
|
||||
<% if node["openstack"]["dashboard"]["identity_api_version"] == 3 %>
|
||||
# NOTE: This value must be the ID of the default domain, NOT the name.
|
||||
# Also, you will most likely have a value in the keystone policy file like this
|
||||
# "cloud_admin": "rule:admin_required and domain_id:<your domain id>"
|
||||
# This value must match the domain id specified there.
|
||||
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = "<%= node["openstack"]["dashboard"]["keystone_default_domain"] %>"
|
||||
<% end %>
|
||||
|
||||
|
@ -118,7 +122,13 @@ SECRET_KEY = secret_key.generate_or_read_from_file(os.path.realpath('<%= node['o
|
|||
|
||||
# We recommend you use memcached for development; otherwise after every reload
|
||||
# of the django development server, you will have to login again. To use
|
||||
# memcached set CACHE_BACKED to something like 'memcached://127.0.0.1:11211/'
|
||||
# memcached set CACHES to something like
|
||||
#CACHES = {
|
||||
# 'default': {
|
||||
# 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
|
||||
# 'LOCATION': '127.0.0.1:11211',
|
||||
# },
|
||||
#}
|
||||
<% case node["openstack"]["dashboard"]["session_backend"]
|
||||
when "file" %>
|
||||
SESSION_ENGINE = 'django.contrib.sessions.backends.file'
|
||||
|
@ -561,23 +571,6 @@ SECURITY_GROUP_RULES = {
|
|||
},
|
||||
}
|
||||
|
||||
FLAVOR_EXTRA_KEYS = {
|
||||
'flavor_keys': [
|
||||
('quota:disk_read_bytes_sec', _('Quota: Read bytes')),
|
||||
('quota:disk_write_bytes_sec', _('Quota: Write bytes')),
|
||||
('quota:cpu_quota', _('Quota: CPU')),
|
||||
('quota:cpu_period', _('Quota: CPU period')),
|
||||
('quota:vif_inbound_average', _('Quota: Inbound average')),
|
||||
('quota:vif_outbound_average', _('Quota: Outbound average')),
|
||||
('hw:cpu_sockets', _('Quota: CPU sockets')),
|
||||
('hw:cpu_cores', _('Quota: CPU cores')),
|
||||
('hw:cpu_threads', _('Quota: CPU threads')),
|
||||
('hw:cpu_max_sockets', _('Quota: Max CPU sockets')),
|
||||
('hw:cpu_max_cores', _('Quota: Max CPU cores')),
|
||||
('hw:cpu_max_threads', _('Quota: Max CPU threads')),
|
||||
]
|
||||
}
|
||||
|
||||
# You may remove settings from this list for security purposes, but do so at
|
||||
# the risk of breaking a built-in horizon feature. These settings are required
|
||||
# for horizon to function properly. Only remove them if you know what you
|
||||
|
|
Loading…
Reference in New Issue