summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-15 00:15:21 +0000
committerGerrit Code Review <review@openstack.org>2017-02-15 00:15:21 +0000
commitff362ebea83fd6e91421941dcea9b294e00c4024 (patch)
tree6a4a7e718fbc18d5b4b7a33f8470b66f80f4e27f /spec
parentdfc498f2adf58c78bd7bd4a3926a658c7c555d5d (diff)
parent0a44474b55a96fa90b58cbdf006139ba8aa27cc0 (diff)
Merge "Make quotes consistent to match the sample config"
Diffstat (limited to 'spec')
-rw-r--r--spec/classes/tripleo_ui_spec.rb28
1 files changed, 14 insertions, 14 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