diff --git a/releasenotes/notes/deprecate-pull-source-1d904126040c2eb1.yaml b/releasenotes/notes/deprecate-pull-source-1d904126040c2eb1.yaml new file mode 100644 index 000000000..19c6a9746 --- /dev/null +++ b/releasenotes/notes/deprecate-pull-source-1d904126040c2eb1.yaml @@ -0,0 +1,5 @@ +--- +deprecations: +- The command "openstack overcloud container image prepare" has deprecated + the --pull-source argument. The source registry should now be specified as + part of the --namespace argument. diff --git a/tripleoclient/tests/v1/overcloud_image/test_container_image.py b/tripleoclient/tests/v1/overcloud_image/test_container_image.py index a4acd834c..c95187bad 100644 --- a/tripleoclient/tests/v1/overcloud_image/test_container_image.py +++ b/tripleoclient/tests/v1/overcloud_image/test_container_image.py @@ -92,7 +92,7 @@ class TestContainerImagePrepare(TestPluginV1): filter=mock.ANY, name_prefix='centos-binary-', name_suffix='', - namespace='tripleoupstream', + namespace='docker.io/tripleoupstream', tag='latest' ) diff --git a/tripleoclient/v1/container_image.py b/tripleoclient/v1/container_image.py index 0515b399a..bcbffdd22 100644 --- a/tripleoclient/v1/container_image.py +++ b/tripleoclient/v1/container_image.py @@ -177,8 +177,7 @@ class PrepareImageFiles(command.Command): dest="pull_source", metavar='', help=_("Location of image registry to pull images from. " - "If specified, a pull_source will be set for every image " - "entry."), + "(DEPRECATED. Include the registry in --namespace)"), ) parser.add_argument( "--push-destination", @@ -199,10 +198,10 @@ class PrepareImageFiles(command.Command): parser.add_argument( "--namespace", dest="namespace", - default="tripleoupstream", + default="docker.io/tripleoupstream", metavar='', help=_("Override the default namespace substitution.\n" - "Default: tripleoupstream"), + "Default: docker.io/tripleoupstream"), ) parser.add_argument( "--prefix",