diff --git a/dicos/29_one-master.xml b/dicos/29_one-master.xml
index 11567a9..5b8378f 100644
--- a/dicos/29_one-master.xml
+++ b/dicos/29_one-master.xml
@@ -23,6 +23,9 @@
oui
+
+ default
+
diff --git a/postservice/30-one-mng b/postservice/30-one-mng
index 05ab4b8..933996c 100755
--- a/postservice/30-one-mng
+++ b/postservice/30-one-mng
@@ -21,44 +21,35 @@ function get_one_auth()
${CMD} ${FILE}
}
-# ref https://dev-eole.ac-dijon.fr/issues/16797
-#function check_cluster()
-#{
-# name="${1}"
-# cmd="onecluster"
-# opt="list"
-# auth=$(get_one_auth)
-#
-# res=0
-# clst_list=$(${cmd} ${opt} --user ${auth%:*} --password ${auth#*:} | tail -n +2 | awk -F ' ' '{print $2}')
-# for hst in ${clst_list}
-# do
-# [[ "${NAME}" = "${hst}" ]] && res=$((res+1))
-# done
-# return ${res}
-#}
+function check_default_cluster()
+{
+ name="${1}"
+ cmd="onecluster show 0"
+ auth=$(get_one_auth)
-# ref https://dev-eole.ac-dijon.fr/issues/16797
-#function manage_cluster()
-#{
-# NAME="${1}"
-# CMD="onecluster create"
-# AUTH=$(get_one_auth)
-#
-# check_cluster ${clst_name}
-# if [[ ${?} -eq 0 ]]
-# then
-# crt=$(${CMD} --user ${AUTH%:*} --password ${AUTH#*:} ${NAME})
-# if [[ ${?} -ne 0 ]]
-# then
-# error "Cluster create failed"
-# else
-# echo "Cluster ${NAME} created"
-# fi
-# else
-# echo "Cluster \"${NAME}\" already exist"
-# fi
-#}
+ DEFAULT_NAME=$(${cmd} --user ${auth%:*} --password ${auth#*:} | awk '/^NAME/ {print $3}')
+ [[ "${name}" = "${DEFAULT_NAME}" ]]
+}
+
+function rename_default_cluster()
+{
+ NAME="${1}"
+ CMD="onecluster rename 0 ${NAME}"
+ AUTH=$(get_one_auth)
+
+ if ! check_default_cluster "${NAME}"
+ then
+
+ if ${CMD} --user ${AUTH%:*} --password ${AUTH#*:}
+ then
+ echo "The default cluster name is now '${NAME}'"
+ else
+ error "The default cluster can not be renamed"
+ fi
+ else
+ echo "The default cluster name is already \"${NAME}\""
+ fi
+}
function check_host()
{
@@ -437,10 +428,9 @@ function manage_datastores()
function main()
{
#
- # Creating Cluster
- # ref https://dev-eole.ac-dijon.fr/issues/16797
- #clst_name=$(CreoleGet one_cluster_name)
- #manage_cluster ${clst_name}
+ # Rename default cluster
+ clst_name=$(CreoleGet one_cluster_name)
+ rename_default_cluster "${clst_name}"
#
# Creating Host
@@ -454,12 +444,12 @@ function main()
#
# Attaching Host to the Cluster
#
- attach_host ${host} "default"
+ attach_host ${host} "${clst_name}"
#
# Création des Datastores
#
- manage_datastores ${clst_name}
+ manage_datastores "${clst_name}"
}
main
diff --git a/postservice/31-one-netmng b/postservice/31-one-netmng
index 5092638..4a2ef90 100755
--- a/postservice/31-one-netmng
+++ b/postservice/31-one-netmng
@@ -289,9 +289,7 @@ def main():
client = CreoleClient()
one_client = OneClient('oneadmin')
networks = []
- # ref https://dev-eole.ac-dijon.fr/issues/16797
- # cluster = client.get_creole('one_cluster_name')
- cluster = "default"
+ cluster = client.get_creole('one_cluster_name')
swname = client.get_creole('ovs_sw_name')
zones = client.get_creole('vnets')
vlans = client.get_creole('vnet_vlan_tag')
diff --git a/scripts/onehost_create_all b/scripts/onehost_create_all
index 0efa546..6886ebb 100755
--- a/scripts/onehost_create_all
+++ b/scripts/onehost_create_all
@@ -24,9 +24,7 @@ function copy_ssh_id()
#
function register_node()
{
- # ref https://dev-eole.ac-dijon.fr/issues/16797
- #cmd="onehost create -i kvm -v kvm -n ovswitch -c \"$(CreoleGet one_cluster_name)\" ${1}"
- cmd="onehost create -i kvm -v kvm -n ovswitch -c \"default\" ${1}"
+ cmd="onehost create -i kvm -v kvm -n ovswitch -c 0 ${1}"
ret=$(su - ${ONEUSER} -c -- "${cmd}")
return $?
}