From 4ae6a9ca37296c39ac04be38d59561d26a081c11 Mon Sep 17 00:00:00 2001 From: "Brad P. Crochet" Date: Mon, 12 Dec 2016 10:41:00 -0500 Subject: [PATCH] Reflect default usage of image build With I31fe363f85a84cc4240111407829ad545e1a33cd the 'overcloud image build' command now defaults to using the CentOS yaml definitions. Change-Id: Ica3083b511bc1c792554d4b552932e9f529719b8 Depends-On: I31fe363f85a84cc4240111407829ad545e1a33cd --- .../basic_deployment/basic_deployment_cli.rst | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/doc/source/basic_deployment/basic_deployment_cli.rst b/doc/source/basic_deployment/basic_deployment_cli.rst index ea103d69..5e9eb1cd 100644 --- a/doc/source/basic_deployment/basic_deployment_cli.rst +++ b/doc/source/basic_deployment/basic_deployment_cli.rst @@ -62,23 +62,22 @@ created on the undercloud, one should use a non-root user. #. Choose image operating system: - The common YAML is - ``/usr/share/openstack-tripleo-common/image-yaml/overcloud-images.yaml``. - It must be specified along with one of the following. - .. admonition:: CentOS :class: centos - The default YAML for CentOS is - ``/usr/share/openstack-tripleo-common/image-yaml/overcloud-images-centos7.yaml`` - - :: - - export OS_YAML="/usr/share/openstack-tripleo-common/image-yaml/overcloud-images-centos7.yaml" + The image build with no arguments will build CentOS 7. It will include the + common YAML of + ``/usr/share/openstack-tripleo-common/image-yaml/overcloud-images.yaml`` + and the CentOS YAML at + ``/usr/share/openstack-tripleo-common/image-yaml/overcloud-images-centos7.yaml``. .. admonition:: RHEL :class: rhel + The common YAML is + ``/usr/share/openstack-tripleo-common/image-yaml/overcloud-images.yaml``. + It must be specified along with the following. + The default YAML for RHEL is ``/usr/share/openstack-tripleo-common/image-yaml/overcloud-images-rhel7.yaml`` @@ -246,7 +245,14 @@ created on the undercloud, one should use a non-root user. :: - openstack overcloud image build --config-file /usr/share/openstack-tripleo-common/image-yaml/overcloud-images.yaml --config-file $OS_YAML + openstack overcloud image build + + .. admonition:: RHEL + :class: rhel + + :: + + openstack overcloud image build --config-file /usr/share/openstack-tripleo-common/image-yaml/overcloud-images.yaml --config-file $OS_YAML See the help for ``openstack overcloud image build`` for further options.