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)
Reviewed: https:/ /review. openstack. org/368821 /git.openstack. org/cgit/ openstack/ python- tripleoclient/ commit/ ?id=98656b57179 02c6ddff7090104 952019d259cc15
Committed: https:/
Submitter: Jenkins
Branch: stable/newton
commit 98656b5717902c6 ddff70901049520 19d259cc15
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: 51d7544205973e5 ea273079e8)
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 3ef0a4b889aed32
Backport #2: b208b60400eccd9 35ee32a8d6)
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 2c0fecf69ce4889
Backport #3: a26aaf4322f2215 683aafe20f3 133a47178fba738 96fb47c2d0)
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: I7a61bf6fb71cc4
(cherry picked from commit c03ed23272442bf
Backport #4: process_ templates action Implements: blueprint custom-roles d9e46a137a8fd5c a6bf166369)
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.
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-
(cherry picked from commit 2898e7595f5df5a
Backport #5: 53e636bec2c3987 9f8644f46e)
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 943f55041589808
Change-Id: I55862204ef71f6 9bc88c79fe2259f 7cb8365699b