Skip to content

Commit

Permalink
Partial-Bug: #1413364
Browse files Browse the repository at this point in the history
Server Manager HA, configuration for mysql , nova , haproxy were
different from fab provisioning

Ha-mon was being started only on openstack[0],
Have done changes to make it start on openstack nodes after provision is
complete.

Testing:
Provisoned and tested that ha-mon is started on all nodes.

Change-Id: I70f3f0d5cefc6c84190eb0b8296bb87df88677bc
  • Loading branch information
thilakrajs committed Feb 17, 2015
1 parent 94f0ef4 commit 3365160
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
9 changes: 0 additions & 9 deletions contrail/environment/modules/contrail/manifests/ha_config.pp
Expand Up @@ -205,15 +205,6 @@
provider => shell,
logoutput => 'true',
}
->
exec { "ha-mon-restart":
command => "service contrail-hamon restart && echo contrail-ha-mon >> /etc/contrail/contrail_openstack_exec.out",
provider => shell,
logoutput => "true",
unless => "grep -qx contrail-ha-mon /etc/contrail/contrail_openstack_exec.out",
# require => File["/opt/contrail/bin/transfer_keys.py"]
}



}
Expand Down
Expand Up @@ -4,6 +4,8 @@
{
$host_control_ip = $::contrail::params::host_ip
$openstack_ip_list = $::contrail::params::openstack_ip_list
$internal_vip = $::contrail::params::internal_vip


contrail::lib::report_status { $state: state => $state }
if ($host_control_ip in $openstack_ip_list) {
Expand All @@ -21,6 +23,15 @@
logoutput => 'true'
}

#Make ha-mon start later
if($internal_vip != "") {
exec { "ha-mon-restart":
command => "service contrail-hamon restart && echo contrail-ha-mon >> /etc/contrail/contrail_openstack_exec.out",
provider => shell,
logoutput => "true",
unless => "grep -qx contrail-ha-mon /etc/contrail/contrail_openstack_exec.out",
}
}

}

Expand Down

0 comments on commit 3365160

Please sign in to comment.