tripleoclient ntp arg should be optional when specified in an environment

[Steven Hardy]

https://review.gerrithub.io/#/c/243699/ implemented a check for multi-node deployments that ensures an ntp server is passed on the CLI, but it fails to consider that passing that data via an environment file is also valid.

We should relax this check to also allow -e env_with_ntp_server.yaml

[Steven Hardy (shardy)]

To clarify, passing:

cat > env.yaml << EOF
parameter_defaults:
  NtpServer: some_server
EOF

openstack overcloud deploy --templates -e env.yaml

Should be equivalent to:

openstack overcloud deploy --templates --ntp-server some server

This works for single node deployments, but the validation in the patch referenced above is in the wrong place - it should validate the parsed environment, including parameters derived from parameters, not the parameter value directly.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/332694

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/332694
Committed: https://git.openstack.org/cgit/openstack/python-tripleoclient/commit/?id=3ef0a4b889aed3251d7544205973e5ea273079e8
Submitter: Jenkins
Branch: master

commit 3ef0a4b889aed3251d7544205973e5ea273079e8
Author: Saravanan KR <email address hidden>
Date: Wed Jun 22 14:06:34 2016 +0530

    NTP arg should be optional when specified in an environment

    For HA deploy, NTP parameter presence is made mandatory, but it should
    be optional if NtpServer parameter has been provided via environment yaml.

    Change-Id: Ic05b4dd8150c2b66f00c433cd46596f73a982a83
    Closes-Bug: 1577928

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/368786

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/368821

[OpenStack Infra (hudson-openstack)]

Change abandoned by Emilien Macchi (<email address hidden>) on branch: stable/newton
Review: https://review.openstack.org/368786
Reason: Need to be squashed, see https://review.openstack.org/#/c/368821/ for more context.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/368821
Committed: https://git.openstack.org/cgit/openstack/python-tripleoclient/commit/?id=98656b5717902c6ddff7090104952019d259cc15
Submitter: Jenkins
Branch: stable/newton

commit 98656b5717902c6ddff7090104952019d259cc15
Author: Saravanan KR <email address hidden>
Date: Wed Jun 22 14:06:34 2016 +0530

    [squash] Required backports for stable/newton

    Because we branched tripleoclient before other TripleO projects,
    some changes in THT broke tripleoclient from stable/newton, and we need
    to backport a serie of patches together otherwise they will never pass
    CI.

    Backport #1:
    NTP arg should be optional when specified in an environment
    For HA deploy, NTP parameter presence is made mandatory, but it should
    be optional if NtpServer parameter has been provided via environment yaml.
    Closes-Bug: 1577928
    (cherry picked from commit 3ef0a4b889aed3251d7544205973e5ea273079e8)

    Backport #2:
    Add 'openstack overcloud plan create' command
    This uses the new Mistral actions and workflows to create a
    plan with the tripleo heat templates. Templates can either
    be provided by the user or the default templates on the
    undercloud can be used.
    Closes-Bug: #1616014
    (cherry picked from commit 2c0fecf69ce4889b208b60400eccd935ee32a8d6)

    Backport #3:
    Update the 'overcloud deploy --templates' command to use Mistral
    This is a backwards compatible version of the deploy command
    which uses the new Mistral workflows to power the deploy.
    Depends-On: I7a61bf6fb71cc4a26aaf4322f2215683aafe20f3
    (cherry picked from commit c03ed23272442bf133a47178fba73896fb47c2d0)

    Backport #4:
    Get template contents from plan, not local path
    This allows the new overcloud.j2.yaml format, which is
    rendered to create the overcloud.yaml file in the swift
    plan via the tripleo.process_templates action
    Note it may be valid to modify the roles_data prior to an update,
    so we need a plan update workflow that can re-run the process_templates
    step.
    Partially-Implements: blueprint custom-roles
    (cherry picked from commit 2898e7595f5df5ad9e46a137a8fd5ca6bf166369)

    Backport #5:
    Update plan files when re-deploying
    When doing a second deploy we need to update the plan templates to match those
    passed into the deploy command. The cleanest way to do this is to remove the
    existing files in swift and then upload the new files.
    Closes-Bug: #1620932
    (cherry picked from commit 943f5504158980853e636bec2c39879f8644f46e)

    Change-Id: I55862204ef71f69bc88c79fe2259f7cb8365699b

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/python-tripleoclient 5.5.0 release.