On Tue, Feb 04, 2014 at 05:00:27PM +0100, Santi Raffa wrote:
> Signed-off-by: Santi Raffa <[email protected]>
> ---
> lib/cli.py | 16 ++++++++++++++++
> lib/client/gnt_instance.py | 7 ++++---
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/lib/cli.py b/lib/cli.py
> index ce43a05..5a99da6 100644
> --- a/lib/cli.py
> +++ b/lib/cli.py
> @@ -164,6 +164,8 @@ __all__ = [
> "ON_SECONDARY_OPT",
> "OFFLINE_OPT",
> "OSPARAMS_OPT",
> + "OSPARAMS_NOLOG_OPT",
> + "OSPARAMS_NOLOG_NOSAVE_OPT",
These should probably be called
OSPARAMS_PRIVATE
OSPARAMS_SECRET
for consistency.
Also, you have several patches like
modify InstanceCreate
modify InstanceReinstall
modify InstanceClusterSetParams
modify InstanceSetParams
but the command line options seem to be split between this patch and
the rest. Is there a reason behind this?
Thanks,
Jose
> "OS_OPT",
> "OS_SIZE_OPT",
> "OOB_TIMEOUT_OPT",
> @@ -947,6 +949,20 @@ OSPARAMS_OPT = cli_option("-O", "--os-parameters",
> dest="osparams",
> type="keyval", default={},
> help="OS parameters")
>
> +OSPARAMS_NOLOG_OPT = cli_option("--os-parameters-private",
> + dest="osparams_private",
> + type="keyprivateval",
> + default=serializer.PrivateDict(),
> + help="Private OS parameters (won't be
> logged)")
> +
> +OSPARAMS_NOLOG_NOSAVE_OPT = cli_option("--os-parameters-secret",
> + dest="osparams_secret",
> + type="keyprivateval",
> + default=serializer.PrivateDict(),
> + help="Secret OS parameters (won't be"
> + " logged or saved; must supply"
> + " every time.)")
> +
> FORCE_VARIANT_OPT = cli_option("--force-variant", dest="force_variant",
> action="store_true", default=False,
> help="Force an unknown variant")
> diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
> index 538a585..6e4539e 100644
> --- a/lib/client/gnt_instance.py
> +++ b/lib/client/gnt_instance.py
> @@ -1545,7 +1545,8 @@ commands = {
> [FORCE_OPT, OS_OPT, FORCE_VARIANT_OPT, m_force_multi, m_node_opt,
> m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt,
> m_node_tags_opt,
> m_pri_node_tags_opt, m_sec_node_tags_opt, m_inst_tags_opt,
> SELECT_OS_OPT]
> - + SUBMIT_OPTS + [DRY_RUN_OPT, PRIORITY_OPT, OSPARAMS_OPT],
> + + SUBMIT_OPTS + [DRY_RUN_OPT, PRIORITY_OPT, OSPARAMS_OPT,
> + OSPARAMS_NOLOG_OPT, OSPARAMS_NOLOG_NOSAVE_OPT],
> "[-f] <instance>", "Reinstall a stopped instance"),
> "remove": (
> RemoveInstance, ARGS_ONE_INSTANCE,
> @@ -1569,8 +1570,8 @@ commands = {
> SetInstanceParams, ARGS_ONE_INSTANCE,
> [BACKEND_OPT, DISK_OPT, FORCE_OPT, HVOPTS_OPT, NET_OPT] + SUBMIT_OPTS +
> [DISK_TEMPLATE_OPT, SINGLE_NODE_OPT, OS_OPT, FORCE_VARIANT_OPT,
> - OSPARAMS_OPT, DRY_RUN_OPT, PRIORITY_OPT, NWSYNC_OPT, OFFLINE_INST_OPT,
> - ONLINE_INST_OPT, IGNORE_IPOLICY_OPT, RUNTIME_MEM_OPT,
> + OSPARAMS_OPT, OSPARAMS_NOLOG_OPT, DRY_RUN_OPT, PRIORITY_OPT, NWSYNC_OPT,
> + OFFLINE_INST_OPT, ONLINE_INST_OPT, IGNORE_IPOLICY_OPT, RUNTIME_MEM_OPT,
> NOCONFLICTSCHECK_OPT, NEW_PRIMARY_OPT, HOTPLUG_OPT,
> HOTPLUG_IF_POSSIBLE_OPT],
> "<instance>", "Alters the parameters of an instance"),
> --
> 1.9.0.rc1.175.g0b1dcb5
>
--
Jose Antonio Lopes
Ganeti Engineering
Google Germany GmbH
Dienerstr. 12, 80331, München
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Graham Law, Christine Elizabeth Flores
Steuernummer: 48/725/00206
Umsatzsteueridentifikationsnummer: DE813741370
