x
/
fuel-plugin-contrail
Code Issues Proposed changes

Patch for keepalived config re-introduced 

This commit addresses the incorrect keepalived configuration issue,
now fab creates a config file with correct devices described.

Change-Id: I7b1b66a0403893559ad7748537acfb6797dcf78f
This commit is contained in:
Oleksandr Martsyniuk 2015-06-25 16:27:22 +03:00
parent 86e663ae01
commit 14db344366
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deployment_scripts/puppet/modules/contrail/files/ha.py.patch
View File

@ -1,18 +1,13 @@
diff -u /opt/contrail/utils/fabfile/tasks/ha.py /opt/contrail/utils/fabfile/tasks/ha.py
--- /opt/contrail/utils/fabfile/tasks/ha.py
+++ /opt/contrail/utils/fabfile/tasks/ha.py
@@ -199,9 +199,12 @@
--- fabfile/tasks/ha.py.orig 2015-06-25 12:59:50.256028918 +0000
+++ fabfile/tasks/ha.py 2015-06-25 13:18:00.060015103 +0000
@@ -222,8 +222,8 @@
def setup_keepalived_node(role):
"""Task to provision VIP for node with keepalived"""
- mgmt_ip = hstr_to_ip(env.host_string)
self_host = get_control_host_string(env.host_string)
- self_ip = hstr_to_ip(self_host)
+
+ # looks like smth messed up several levels below, so vars are swapped and
+ # it's the only way which works
+ self_ip = env.hoststring_mgm_ip[env.host_string]
+ mgmt_ip = env.hoststring_public_ip[env.host_string]
- self_host = get_control_host_string(env.host_string)
+ mgmt_ip = env.hoststring_mgm_ip[env.host_string]
+ self_host = get_control_host_string(env.host_string)
self_ip = hstr_to_ip(self_host)
internal_vip = get_openstack_internal_vip()
external_vip = get_openstack_external_vip()

9
deployment_scripts/puppet/modules/contrail/manifests/setup.pp
View File

@ -36,7 +36,14 @@ class contrail::setup ($node_name)
command => 'patch /opt/contrail/utils/fabfile/utils/commandline.py /tmp/commandline.py.patch && touch /opt/contrail/commandline.py.patch-DONE',
creates => '/opt/contrail/commandline.py.patch-DONE'
} ->
file {'/tmp/ha.py.patch':
ensure => file,
source => 'puppet:///modules/contrail/ha.py.patch'
} ->
exec {'ha.py.patch':
command => 'patch /opt/contrail/utils/fabfile/tasks/ha.py /tmp/ha.py.patch && touch /opt/contrail/ha.py.patch-DONE',
creates => '/opt/contrail/ha.py.patch-DONE'
} ->
file {'/tmp/keepalived_conf_template.py.patch':
ensure => file,
source => 'puppet:///modules/contrail/keepalived_conf_template.py.patch'