x
/
puppet-midonet
Code Issues Proposed changes

Merge "Point to ocata branch in .gitreview" into stable/ocata

This commit is contained in:
Jenkins 2017-02-24 10:25:33 +00:00 committed by Gerrit Code Review
parent 5c745981b7 48f9b22d81
commit c7c8c70869
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitreview
View File

@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/puppet-midonet.git
defaultbranch=stable/ocata

6
manifests/mem.pp
View File

@ -172,7 +172,7 @@ class midonet::mem(
) inherits midonet::params {
$mem_ws = $insights_ssl? {true => 'wss://' , default => 'ws://'}
$api_proto = $api_ssl? {true => 'https://' , default => 'http://'}
$api_proto = $api_ssl? {true => 'https://' , default => 'http://'}
validate_bool($mem_api_token)
@ -241,6 +241,10 @@ class midonet::mem(
path => '/var/www/html/midonet-manager',
}
],
proxy_pass +> [
{ 'path' => '/midonet-api', 'url' => 'http://localhost:8181/midonet-api' },
],
proxy_preserve_host => true
}
}
}