diff options
author | Tim Rozet <trozet@redhat.com> | 2016-12-06 12:58:55 -0500 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2016-12-08 21:52:32 -0500 |
commit | 58a098e08ec131338b0c29b902472c54b2a26168 (patch) | |
tree | 8fb5727e1511d1114cd5b60f0659d624105b4542 /build/opnfv-puppet-tripleo.patch | |
parent | 9131b0a81c22e713b4d4798d7ff32254be3b99e3 (diff) |
Fixes and cleans up build/cache directory usage
Changes include:
- Building is isolated to a .build directory that is git ignored
- Caching is isolated to a .cache directory that is git ignored
- Build scripts have been variablized, and relative paths have been
removed
- Unused files removed
- build.sh, make file cleaned up
- Fixed broken building of markupsafe and jinja2 packages
- make clean-cache will remove the cache now
- per item cleans are removed in place of simple clean .build now
- includes fix for OSC issue with LP# 1642301
Change-Id: I42b8e4eb694bf0a2c398858814f8b73785931896
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build/opnfv-puppet-tripleo.patch')
-rw-r--r-- | build/opnfv-puppet-tripleo.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/build/opnfv-puppet-tripleo.patch b/build/opnfv-puppet-tripleo.patch deleted file mode 100644 index 99d3c742..00000000 --- a/build/opnfv-puppet-tripleo.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 9f012bc3e4f23fa756f5435ee69e5d51dd6fc874 Mon Sep 17 00:00:00 2001 -From: Tim Rozet <tdrozet@gmail.com> -Date: Thu, 3 Mar 2016 14:36:11 -0500 -Subject: [PATCH] Adds ODL to load balancer - ---- - manifests/loadbalancer.pp | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp -index 2fcfac6..6e13566 100644 ---- a/manifests/loadbalancer.pp -+++ b/manifests/loadbalancer.pp -@@ -247,6 +247,10 @@ - # (optional) Enable or not Redis binding - # Defaults to false - # -+# [*opendaylight*] -+# (optional) Enable or not OpenDaylight binding -+# Defaults to false -+# - class tripleo::loadbalancer ( - $controller_virtual_ip, - $control_virtual_interface, -@@ -299,6 +303,7 @@ class tripleo::loadbalancer ( - $mysql_clustercheck = false, - $rabbitmq = false, - $redis = false, -+ $opendaylight = false, - ) { - - if !$controller_host and !$controller_hosts { -@@ -1044,4 +1049,26 @@ class tripleo::loadbalancer ( - } - } - -+ $opendaylight_api_vip = hiera('opendaylight_api_vip', $controller_virtual_ip) -+ $opendaylight_bind_opts = { -+ "${opendaylight_api_vip}:8081" => [], -+ "${public_virtual_ip}:8081" => [], -+ } -+ -+ if $opendaylight { -+ haproxy::listen { 'opendaylight': -+ bind => $opendaylight_bind_opts, -+ options => { -+ 'balance' => 'source', -+ }, -+ collect_exported => false, -+ } -+ haproxy::balancermember { 'opendaylight': -+ listening_service => 'opendaylight', -+ ports => '8081', -+ ipaddresses => hiera('opendaylight_api_node_ips', $controller_hosts_real), -+ server_names => $controller_hosts_names_real, -+ options => ['check', 'inter 2000', 'rise 2', 'fall 5'], -+ } -+ } - } --- -2.5.0 - |