diff options
| -rw-r--r-- | spec/classes/tripleo_ui_spec.rb | 28 | ||||
| -rw-r--r-- | templates/ui/tripleo_ui_config.js.erb | 28 |
2 files changed, 35 insertions, 21 deletions
diff --git a/spec/classes/tripleo_ui_spec.rb b/spec/classes/tripleo_ui_spec.rb index 0805e58..f3a4f25 100644 --- a/spec/classes/tripleo_ui_spec.rb +++ b/spec/classes/tripleo_ui_spec.rb @@ -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('/var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js') - .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(/"zaqar-websocket": "wss:\/\/127.0.0.1:443\/zaqar"/) - .with_content(/"ironic": "https:\/\/127.0.0.1:443\/ironic"/) - .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(/"zaqar_default_queue": "tripleo"/) + .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(/'zaqar-websocket': 'wss:\/\/127.0.0.1:443\/zaqar'/) + .with_content(/'ironic': 'https:\/\/127.0.0.1:443\/ironic'/) + .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(/'zaqar_default_queue': 'tripleo'/) 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('/var/www/openstack-tripleo-ui/dist/tripleo_ui_config.js') - .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(/"zaqar-websocket": "wss:\/\/127.0.0.1:443\/zaqar"/) - .with_content(/"ironic": "https:\/\/127.0.0.1:443\/ironic"/) - .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(/"zaqar_default_queue": "tripleo"/) + .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(/'zaqar-websocket': 'wss:\/\/127.0.0.1:443\/zaqar'/) + .with_content(/'ironic': 'https:\/\/127.0.0.1:443\/ironic'/) + .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(/'zaqar_default_queue': 'tripleo'/) end end diff --git a/templates/ui/tripleo_ui_config.js.erb b/templates/ui/tripleo_ui_config.js.erb index 1dd68c6..d49fe8e 100644 --- a/templates/ui/tripleo_ui_config.js.erb +++ b/templates/ui/tripleo_ui_config.js.erb @@ -1,11 +1,25 @@ window.tripleOUiConfig = { - "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 %>", + // Service URLs (defaults to UI host) + // + // A valid Keystone service URL is required. The other endpoints + // will then be obtained automatically from the Keystone catalog. + // + '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 - "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'] }; |