Cadoles
/
eole-one-master
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into dist/eole/2.7.0/develop

This commit is contained in:
vincent 2019-03-07 09:23:39 +01:00
parent 458e5b4ca2 2008031e91
commit f1e9d45e62
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diagnose/04-virtualisation
View File

@ -80,7 +80,7 @@ then
echo "" echo ""
else else
for VM in $VMs ; do for VM in $VMs ; do
NAME=$( one "onevm show $VM" | grep 'NAME' | cut -d: -f2 ) NAME=$( one "onevm show $VM" | grep '^NAME' | cut -d: -f2 )
STAT=$(one "onevm show $VM" | grep '^STATE' | cut -d: -f2 | tr -d ' ' ) STAT=$(one "onevm show $VM" | grep '^STATE' | cut -d: -f2 | tr -d ' ' )
printf ". %${len_pf}s => " "$NAME" printf ". %${len_pf}s => " "$NAME"
eOneStatus "$STAT" eOneStatus "$STAT"

2
dicos/29_one-master.xml
View File

@ -7,6 +7,7 @@
<file filelist='onesinglenode' name='/etc/one/sched.conf' rm='True'/> <file filelist='onesinglenode' name='/etc/one/sched.conf' rm='True'/>
<file filelist='onesinglenode' name='/var/lib/one/remotes/etc/vnm/OpenNebulaNetwork.conf' rm='True' mkdir='True'/> <file filelist='onesinglenode' name='/var/lib/one/remotes/etc/vnm/OpenNebulaNetwork.conf' rm='True' mkdir='True'/>
<file filelist='onesinglenode' name='/etc/one/auth/ldap_auth.conf'/> <file filelist='onesinglenode' name='/etc/one/auth/ldap_auth.conf'/>
<file filelist='one_ha' name='/usr/share/eole/bastion/data/60-one' mode='755'/>
<service>opennebula</service> <service>opennebula</service>
<service>opennebula-scheduler</service> <service>opennebula-scheduler</service>
@ -233,6 +234,7 @@
<target type='variable'>one_vip</target> <target type='variable'>one_vip</target>
<target type='variable'>one_vip_mask</target> <target type='variable'>one_vip_mask</target>
<target type='service_accesslist'>sunstone_xmlrpc</target> <target type='service_accesslist'>sunstone_xmlrpc</target>
<target type='filelist'>one_ha</target>
</condition> </condition>
<fill name='calc_val' target='one_vip_mask'> <fill name='calc_val' target='one_vip_mask'>

8
postservice/31-one-netmng
View File

@ -303,6 +303,14 @@ def main():
logger.debug(u"Configure OpenNebula networks") logger.debug(u"Configure OpenNebula networks")
client = CreoleClient() client = CreoleClient()
mode_ha = client.get_creole('activer_one_ha')
if mode_ha == "oui":
indx = client.get_creole('one_ha_server_index')
if indx != 0:
# Mode HA is on and we are not in the Leader
exit(0)
one_client = OneClient('oneadmin') one_client = OneClient('oneadmin')
networks = [] networks = []
cluster = client.get_creole('one_cluster_name') cluster = client.get_creole('one_cluster_name')

3
scripts/onehost_create_all
View File

@ -201,7 +201,6 @@ for host in ${HAPY_SLV}; do
EchoVert " * Enregistrement du noeud" EchoVert " * Enregistrement du noeud"
register_node ${host} register_node ${host}
# wait_node_ok ${host}
if [[ ${HAPY_HA} == "oui" ]] if [[ ${HAPY_HA} == "oui" ]]
then then
if [[ $DBMODE == "sqlite" ]] if [[ $DBMODE == "sqlite" ]]
@ -213,11 +212,13 @@ for host in ${HAPY_SLV}; do
fi fi
fi fi
sync_nodes sync_nodes
if [[ ${HAPY_HA} != "oui" ]]
wait_node_ok ${HAPY_SLV[${i}]} wait_node_ok ${HAPY_SLV[${i}]}
if [[ ${?} -ne 0 ]] if [[ ${?} -ne 0 ]]
then then
EchoRouge "Erreur lors de l'enregistrement du noeud ${HAPY_SLV[${i}]} !" EchoRouge "Erreur lors de l'enregistrement du noeud ${HAPY_SLV[${i}]} !"
fi fi
fi
done done
if [ $master = 0 ]; then if [ $master = 0 ]; then

5
tmpl/60-one Normal file
View File

@ -0,0 +1,5 @@
#!/bin/bash
%for %%host in %%one_nodes
/sbin/iptables -A eth%%{one_node_int}-root -s %%host -p tcp --syn -j ACCEPT
%end for