m4_define([gnt_version_major], [2])
m4_define([gnt_version_minor], [6])
m4_define([gnt_version_revision], [0])
-m4_define([gnt_version_suffix], [~rc2])
+m4_define([gnt_version_suffix], [])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
gnt_version_major, gnt_version_minor,
[lvm_stripecount="1"])
AC_SUBST(LVM_STRIPECOUNT, $lvm_stripecount)
+# --with-ssh-login-user=...
+AC_ARG_WITH([ssh-login-user],
+ [AS_HELP_STRING([--with-ssh-login-user=USERNAME],
+ [user to use for SSH logins within the cluster (default is root)]
+ )],
+ [ssh_login_user="$withval"],
+ [ssh_login_user=root])
+AC_SUBST(SSH_LOGIN_USER, $ssh_login_user)
+
+# --with-ssh-console-user=...
+AC_ARG_WITH([ssh-console-user],
+ [AS_HELP_STRING([--with-ssh-console-user=USERNAME],
+ [user to use for SSH logins to access instance consoles (default is root)]
+ )],
+ [ssh_console_user="$withval"],
+ [ssh_console_user=root])
+AC_SUBST(SSH_CONSOLE_USER, $ssh_console_user)
+
+# --with-default-user=...
+AC_ARG_WITH([default-user],
+ [AS_HELP_STRING([--with-default-user=USERNAME],
+ [default user for daemons]
+ [ (default is to run all daemons as root)]
+ )],
+ [user_default="$withval"],
+ [user_default=root])
+
+# --with-default-group=...
+AC_ARG_WITH([default-group],
+ [AS_HELP_STRING([--with-default-group=GROUPNAME],
+ [default group for daemons]
+ [ (default is to run all daemons under group root)]
+ )],
+ [group_default="$withval"],
+ [group_default=root])
+
# --with-user-prefix=...
AC_ARG_WITH([user-prefix],
[AS_HELP_STRING([--with-user-prefix=PREFIX],
[prefix for daemon users]
- [ (default is to run all daemons as root)]
+ [ (default is to run all daemons as root; use --with-default-user]
+ [ to change the default)]
)],
[user_masterd="${withval}masterd";
user_rapi="${withval}rapi";
user_confd="${withval}confd";
- user_noded="root"],
- [user_masterd="root";
- user_rapi="root";
- user_confd="root";
- user_noded="root"])
+ user_noded="$user_default"],
+ [user_masterd="$user_default";
+ user_rapi="$user_default";
+ user_confd="$user_default";
+ user_noded="$user_default"])
AC_SUBST(MASTERD_USER, $user_masterd)
AC_SUBST(RAPI_USER, $user_rapi)
AC_SUBST(CONFD_USER, $user_confd)
AC_ARG_WITH([group-prefix],
[AS_HELP_STRING([--with-group-prefix=PREFIX],
[prefix for daemon POSIX groups]
- [ (default is to run all daemons under group root)]
+ [ (default is to run all daemons under group root; use]
+ [ --with-default-group to change the default)]
)],
[group_rapi="${withval}rapi";
group_admin="${withval}admin";
group_confd="${withval}confd";
group_masterd="${withval}masterd";
- group_noded="root";
+ group_noded="$group_default";
group_daemons="${withval}daemons";],
- [group_rapi="root";
- group_admin="root";
- group_confd="root";
- group_masterd="root";
- group_noded="root";
- group_daemons="root"])
+ [group_rapi="$group_default";
+ group_admin="$group_default";
+ group_confd="$group_default";
+ group_masterd="$group_default";
+ group_noded="$group_default";
+ group_daemons="$group_default"])
AC_SUBST(RAPI_GROUP, $group_rapi)
AC_SUBST(ADMIN_GROUP, $group_admin)
AC_SUBST(CONFD_GROUP, $group_confd)
[],
[enable_htools_rapi=no])
-# --enable-htools
+# --enable-confd
ENABLE_CONFD=
AC_ARG_ENABLE([confd],
[AS_HELP_STRING([--enable-confd],
- [enable the ganeti-confd daemon (default: python, options haskell/python/no)])],
+ [enable the ganeti-confd daemon (default: yes)])],
[[case "$enableval" in
no)
enable_confd=False
- py_confd=False
- hs_confd=False
;;
- yes|python)
+ yes|haskell)
enable_confd=True
- py_confd=True
- hs_confd=False
- ;;
- haskell)
- enable_confd=True
- py_confd=False
- hs_confd=True
;;
*)
echo "Invalid value for enable-confd '$enableval'"
;;
esac
]],
- [enable_confd=True;py_confd=True;hs_confd=False])
+ [enable_confd=True])
AC_SUBST(ENABLE_CONFD, $enable_confd)
-AC_SUBST(PY_CONFD, $py_confd)
-AC_SUBST(HS_CONFD, $hs_confd)
-AM_CONDITIONAL([WANT_CONFD], [test x$enable_confd = xTrue])
-AM_CONDITIONAL([PY_CONFD], [test x$py_confd = xTrue])
-AM_CONDITIONAL([HS_CONFD], [test x$hs_confd = xTrue])
+AM_CONDITIONAL([ENABLE_CONFD], [test x$enable_confd = xTrue])
+
+# --enable-split-query
+ENABLE_SPLIT_QUERY=
+AC_ARG_ENABLE([split-query],
+ [AS_HELP_STRING([--enable-split-query],
+ [enable use of custom query daemon via confd])],
+ [[case "$enableval" in
+ no)
+ enable_split_query=False
+ ;;
+ yes)
+ enable_split_query=True
+ ;;
+ *)
+ echo "Invalid value for enable-confd '$enableval'"
+ exit 1
+ ;;
+ esac
+ ]],
+ [enable_split_query=False])
+AC_SUBST(ENABLE_SPLIT_QUERY, $enable_split_query)
+
+if test x$enable_split_query = xTrue -a x$enable_confd != xTrue; then
+ AC_MSG_ERROR([Split queries require the confd daemon])
+fi
# --with-disk-separator=...
AC_ARG_WITH([disk-separator],
fi # end if enable_htools, define automake conditions
-if test "$HTOOLS" != "yes" && test "$HS_CONFD" = "True"; then
- AC_MSG_ERROR(m4_normalize([cannot enable Haskell version of ganeti-confd if
+if test "$HTOOLS" != "yes" && test "$ENABLE_CONFD" = "True"; then
+ AC_MSG_ERROR(m4_normalize([cannot enable ganeti-confd if
htools support is not enabled]))
fi