openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Make quotes consistent to match the sample config"

Browse Source
This commit is contained in:
Jenkins 2017-02-15 00:15:21 +00:00 committed by Gerrit Code Review
commit ff362ebea8
2 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spec/classes/tripleo_ui_spec.rb
View File

@ -53,13 +53,13 @@ describe 'tripleo::ui' do
) )
is_expected.to contain_file('/etc/httpd/conf.d/openstack-tripleo-ui.conf').with_content(/cleaned by Puppet/) is_expected.to contain_file('/etc/httpd/conf.d/openstack-tripleo-ui.conf').with_content(/cleaned by Puppet/)
is_expected.to contain_file('/var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js') is_expected.to contain_file('/var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js')
.with_content(/"keystone": "https:\/\/127.0.0.1:443\/keystone\/v2.0"/) .with_content(/'keystone': 'https:\/\/127.0.0.1:443\/keystone\/v2.0'/)
.with_content(/"heat": "https:\/\/127.0.0.1:443\/heat\/v1\/%\(tenant_id\)s"/) .with_content(/'heat': 'https:\/\/127.0.0.1:443\/heat\/v1\/%\(tenant_id\)s'/)
.with_content(/"zaqar-websocket": "wss:\/\/127.0.0.1:443\/zaqar"/) .with_content(/'zaqar-websocket': 'wss:\/\/127.0.0.1:443\/zaqar'/)
.with_content(/"ironic": "https:\/\/127.0.0.1:443\/ironic"/) .with_content(/'ironic': 'https:\/\/127.0.0.1:443\/ironic'/)
.with_content(/"mistral": "https:\/\/127.0.0.1:443\/mistral\/v2"/) .with_content(/'mistral': 'https:\/\/127.0.0.1:443\/mistral\/v2'/)
.with_content(/"swift": "https:\/\/127.0.0.1:443\/swift\/v1\/AUTH_%\(tenant_id\)s"/) .with_content(/'swift': 'https:\/\/127.0.0.1:443\/swift\/v1\/AUTH_%\(tenant_id\)s'/)
.with_content(/"zaqar_default_queue": "tripleo"/) .with_content(/'zaqar_default_queue': 'tripleo'/)
end end
end end
@ -96,13 +96,13 @@ describe 'tripleo::ui' do
) )
is_expected.to contain_file('/etc/httpd/conf.d/openstack-tripleo-ui.conf').with_content(/cleaned by Puppet/) is_expected.to contain_file('/etc/httpd/conf.d/openstack-tripleo-ui.conf').with_content(/cleaned by Puppet/)
is_expected.to contain_file('/var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js') is_expected.to contain_file('/var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js')
.with_content(/"keystone": "https:\/\/127.0.0.1:443\/keystone\/v2.0"/) .with_content(/'keystone': 'https:\/\/127.0.0.1:443\/keystone\/v2.0'/)
.with_content(/"heat": "https:\/\/127.0.0.1:443\/heat\/v1\/%\(tenant_id\)s"/) .with_content(/'heat': 'https:\/\/127.0.0.1:443\/heat\/v1\/%\(tenant_id\)s'/)
.with_content(/"zaqar-websocket": "wss:\/\/127.0.0.1:443\/zaqar"/) .with_content(/'zaqar-websocket': 'wss:\/\/127.0.0.1:443\/zaqar'/)
.with_content(/"ironic": "https:\/\/127.0.0.1:443\/ironic"/) .with_content(/'ironic': 'https:\/\/127.0.0.1:443\/ironic'/)
.with_content(/"mistral": "https:\/\/127.0.0.1:443\/mistral\/v2"/) .with_content(/'mistral': 'https:\/\/127.0.0.1:443\/mistral\/v2'/)
.with_content(/"swift": "https:\/\/127.0.0.1:443\/swift\/v1\/AUTH_%\(tenant_id\)s"/) .with_content(/'swift': 'https:\/\/127.0.0.1:443\/swift\/v1\/AUTH_%\(tenant_id\)s'/)
.with_content(/"zaqar_default_queue": "tripleo"/) .with_content(/'zaqar_default_queue': 'tripleo'/)
end end
end end

28
templates/ui/tripleo_ui_config.js.erb
View File

@ -1,11 +1,25 @@
window.tripleOUiConfig = { window.tripleOUiConfig = {
"keystone": "<%= @endpoint_config_keystone %>", // Service URLs (defaults to UI host)
"heat": "<%= @endpoint_config_heat %>", //
"ironic": "<%= @endpoint_config_ironic %>", // A valid Keystone service URL is required. The other endpoints
"mistral": "<%= @endpoint_config_mistral %>", // will then be obtained automatically from the Keystone catalog.
"swift": "<%= @endpoint_config_swift %>", //
"zaqar-websocket": "<%= @endpoint_config_zaqar %>", 'keystone': '<%= @endpoint_config_keystone %>',
'heat': '<%= @endpoint_config_heat %>',
'ironic': '<%= @endpoint_config_ironic %>',
'mistral': '<%= @endpoint_config_mistral %>',
'swift': '<%= @endpoint_config_swift %>',
'zaqar-websocket': '<%= @endpoint_config_zaqar %>',
// Default websocket queue name // Default websocket queue name
"zaqar_default_queue": "<%= @zaqar_default_queue %>" 'zaqar_default_queue': '<%= @zaqar_default_queue %>'
// Languages
// If you choose more than one language, a language switcher will appear in
// the navigation bar.
// Only 'en' (English) is enabled by default.
// 'languages': ['en-GB', 'en', 'ja', 'ko-KR', 'zh-CN', 'es'],
// Logging
// 'loggers': ['console']
}; };