x
/
puppet-midonet
Code Issues Proposed changes

Allow parameterized WS endpoint 

Change-Id: If7eb3ac200013472a88ea5c84351466035fd836f
This commit is contained in:
Alex Ruiz Estradera 2016-11-14 11:54:21 +01:00
parent c6a082bbd0
commit 666e49e9d4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/mem.pp
View File

@ -157,7 +157,7 @@ class midonet::mem(
$is_ssl = false,
$ssl_cert = '',
$ssl_key = '',
$insights_ssl = undef,
$insights_ssl = false,
$mem_api_port = ':8181',
$mem_trace_port = ':8460',
$mem_analytics_port = ':8080',
@ -180,11 +180,11 @@ class midonet::mem(
$mem_login_host = "http://${cluster_ip}${mem_api_port}"
$mem_trace_api_host = "http://${cluster_ip}${mem_api_port}"
$mem_traces_ws_url = "wss://${cluster_ip}${mem_trace_port}/${mem_trace_namespace}"
$mem_traces_ws_url = "${$mem_ws}://${cluster_ip}${mem_trace_port}/${mem_trace_namespace}"
$mem_api_host = "http://${cluster_ip}${mem_api_port}"
$mem_analytics_ws_api_url = "ws://${analytics_ip}${mem_analytics_port}/${mem_analytics_namespace}"
$mem_subscriptions_ws_api_url = "wss://${cluster_ip}${mem_subscription_port}/subscription"
$mem_fabric_ws_api_url = "wss://${cluster_ip}${mem_fabric_port}/fabric"
$mem_analytics_ws_api_url = "${$mem_ws}://${analytics_ip}${mem_analytics_port}/${mem_analytics_namespace}"
$mem_subscriptions_ws_api_url = "${$mem_ws}://${cluster_ip}${mem_subscription_port}/subscription"
$mem_fabric_ws_api_url = "${$mem_ws}://${cluster_ip}${mem_fabric_port}/fabric"
$mem_apache_servername = $cluster_ip

4
spec/files/functions
View File

@ -9,7 +9,7 @@
# - ``SCRIPT_DIR`` must be set to script path
# - ``GEM_BIN_DIR`` must be set to Gem bin directory
install_external() {
PUPPETFILE=${SCRIPT_DIR}/Puppetfile r10k puppetfile install -v
PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 r10k puppetfile install -v
}
# Install Puppet OpenStack modules with zuul-cloner
@ -32,7 +32,7 @@ EOF
ZUUL_BRANCH=${ZUUL_BRANCH:-master}
local project_names=$(awk '{ if ($1 == ":git") print $3 }' \
${SCRIPT_DIR}/Puppetfile | tr -d "'," | cut -d '/' -f 4- | xargs
${SCRIPT_DIR}/Puppetfile0 | tr -d "'," | cut -d '/' -f 4- | xargs
)
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml \
--cache-dir /opt/git \