Minor fixes in manifests
* Fix typo in server.pp * Move network preparation to server.pp * Temporarily disable building deb packages
This commit is contained in:
parent
f1341b8774
commit
972539b30d
|
@ -2,8 +2,6 @@ notice('MODULAR: congress.pp')
|
||||||
|
|
||||||
$management_vip = hiera('management_vip')
|
$management_vip = hiera('management_vip')
|
||||||
$public_vip = hiera('public_vip')
|
$public_vip = hiera('public_vip')
|
||||||
$network_scheme = hiera_hash('network_scheme', {})
|
|
||||||
prepare_network_config($network_scheme)
|
|
||||||
|
|
||||||
$plugin_hash = hiera_hash('congress', {})
|
$plugin_hash = hiera_hash('congress', {})
|
||||||
$debug = $plugin_hash['debug']
|
$debug = $plugin_hash['debug']
|
||||||
|
|
|
@ -2,6 +2,8 @@ notice('MODULAR: congress/server.pp')
|
||||||
|
|
||||||
$management_vip = hiera('management_vip')
|
$management_vip = hiera('management_vip')
|
||||||
$public_vip = hiera('public_vip')
|
$public_vip = hiera('public_vip')
|
||||||
|
$network_scheme = hiera_hash('network_scheme', {})
|
||||||
|
prepare_network_config($network_scheme)
|
||||||
|
|
||||||
$plugin_hash = hiera_hash('congress', {})
|
$plugin_hash = hiera_hash('congress', {})
|
||||||
$congress_hash = $plugin_hash['metadata']
|
$congress_hash = $plugin_hash['metadata']
|
||||||
|
@ -36,12 +38,12 @@ class { 'congress::keystone::authtoken':
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class {'congress::server':
|
|
||||||
enabled => $service_enabled,
|
|
||||||
bing_host => $bind_host,
|
|
||||||
bind_port => $bind_port
|
|
||||||
}
|
|
||||||
|
|
||||||
class {'congress::policy':
|
class {'congress::policy':
|
||||||
policies => $policies
|
policies => $policies
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class {'congress::server':
|
||||||
|
enabled => $service_enabled,
|
||||||
|
bind_host => $bind_host,
|
||||||
|
bind_port => $bind_port
|
||||||
|
}
|
||||||
|
|
|
@ -63,7 +63,8 @@ git_download "${CONGRESS_REPO}" "${CONGRESS_BRANCH}" "${CONGRESS_DST_DIR}"
|
||||||
|
|
||||||
git_download "${CONGRESS_CLI_REPO}" "${CONGRESS_CLI_BRANCH}" "${CONGRESS_CLI_DST_DIR}"
|
git_download "${CONGRESS_CLI_REPO}" "${CONGRESS_CLI_BRANCH}" "${CONGRESS_CLI_DST_DIR}"
|
||||||
|
|
||||||
build_deb
|
# FIXME: make building deb packages optional
|
||||||
|
# build_deb
|
||||||
|
|
||||||
clean
|
clean
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue