overcloud container image prepare should support --env-dir

[plieb]

The comand 'openstack overcloud container image prepare' does not support the --env-dir parameter. This parameter is used by the overcloud deploy command to manage deployments with many environment files.

For example:
openstack overcloud deploy \
   -e /home/stack/templates/node-info.yaml \
   -r /home/stack/templates/roles_data.yaml \
   --environment-directory /home/stack/templates/environments/

ls /home/stack/templates/environments/
20-network-environment.yaml
30-compute-settings.yaml
60-ceph-ansible.yaml

Add this option to reduce the length and complexity of the command, and allow the same directory to be re-used for both commands.

Also the order of inclusion is important for both commands, and this would ensure consistency between them.

For example:

openstack overcloud container image prepare \
--namespace 172.16.0.1:8787/rhosp12 \
--env-file=/home/stack/templates/overcloud_images.yaml \
--prefix=openstack- \
--suffix=-docker \
--tag 20171004.1 \
--set ceph_namespace=172.16.0.1:8787/ceph \
--set ceph_image=rhceph-2-rhel7 \
--set ceph_tag=latest \
-e /home/stack/templates/environments/20-network-environment.yaml \
-e /home/stack/templates/environments/30-compute-settings.yaml \
-e /home/stack/templates/environments/60-ceph-ansible.yaml \
-r /usr/share/openstack-tripleo-heat-templates/roles_data.yaml

Would become:

openstack overcloud container image prepare \
--namespace 172.16.0.1:8787/rhosp12 \
--env-file=/home/stack/templates/overcloud_images.yaml \
--prefix=openstack- \
--suffix=-docker \
--tag 20171004.1 \
--set ceph_namespace=172.16.0.1:8787/ceph \
--set ceph_image=rhceph-2-rhel7 \
--set ceph_tag=latest \
--env-dir /home/stack/templates/environments
-r /usr/share/openstack-tripleo-heat-templates/roles_data.yaml

Openstack Pike

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/511521
Committed: https://git.openstack.org/cgit/openstack/python-tripleoclient/commit/?id=40fe7915653f0dbfd3f19ace4b4be52fcee3c96f
Submitter: Zuul
Branch: master

commit 40fe7915653f0dbfd3f19ace4b4be52fcee3c96f
Author: Martin André <email address hidden>
Date: Thu Oct 12 17:22:18 2017 +0100

    Add --environment-directory to the prepare command

    Implement the '--environment-directory' option to the prepare command
    to match what the deploy command does.

    Change-Id: I9192492580ec95c7d5c9c2ab7b06b79a73025859
    Closes-Bug: #1723057

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/pike
Review: https://review.openstack.org/518042

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/518042
Committed: https://git.openstack.org/cgit/openstack/python-tripleoclient/commit/?id=dfdfcdec3cf88adf29c6938453477a36b13d7590
Submitter: Zuul
Branch: stable/pike

commit dfdfcdec3cf88adf29c6938453477a36b13d7590
Author: Martin André <email address hidden>
Date: Thu Oct 12 17:22:18 2017 +0100

    Add --environment-directory to the prepare command

    Implement the '--environment-directory' option to the prepare command
    to match what the deploy command does.

    Change-Id: I9192492580ec95c7d5c9c2ab7b06b79a73025859
    Closes-Bug: #1723057
    (cherry picked from commit 40fe7915653f0dbfd3f19ace4b4be52fcee3c96f)

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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