diff --git a/contrib/python/podman/examples/run_example.sh b/contrib/python/podman/examples/run_example.sh index 0f6575073e8..958690e1370 100755 --- a/contrib/python/podman/examples/run_example.sh +++ b/contrib/python/podman/examples/run_example.sh @@ -22,8 +22,8 @@ if [[ $(id -u) != 0 ]]; then exit 2 fi -if ! systemctl --quiet is-active io.projectatomic.podman.socket; then - echo 1>&2 'podman is not running. systemctl enable --now io.projectatomic.podman.socket' +if ! systemctl --quiet is-active io.containers.podman.socket; then + echo 1>&2 'podman is not running. systemctl enable --now io.containers.podman.socket' exit 1 fi diff --git a/contrib/python/podman/podman/client.py b/contrib/python/podman/podman/client.py index 5efd2be2bd0..9e4a7c0e7b2 100644 --- a/contrib/python/podman/podman/client.py +++ b/contrib/python/podman/podman/client.py @@ -30,7 +30,7 @@ def __call__(self): @classmethod def factory(cls, uri=None, - interface='io.projectatomic.podman', + interface='io.containers.podman', *args, **kwargs): """Construct a Client based on input.""" @@ -150,18 +150,18 @@ class Client(): >>> import podman >>> c = podman.Client(uri='unix:/tmp/podman.sock', - remote_uri='ssh://user@host/run/podman/io.projectatomic.podman', + remote_uri='ssh://user@host/run/podman/io.containers.podman', identity_file='~/.ssh/id_rsa') """ def __init__(self, - uri='unix:/run/podman/io.projectatomic.podman', - interface='io.projectatomic.podman', + uri='unix:/run/podman/io.containers.podman', + interface='io.containers.podman', **kwargs): """Construct a podman varlink Client. uri from default systemd unit file. - interface from io.projectatomic.podman.varlink, do not change unless + interface from io.containers.podman.varlink, do not change unless you are a varlink guru. """ self._client = BaseClient.factory(uri, interface, **kwargs) diff --git a/contrib/python/podman/podman/libs/errors.py b/contrib/python/podman/podman/libs/errors.py index d34577a5763..66d8e1996e4 100644 --- a/contrib/python/podman/podman/libs/errors.py +++ b/contrib/python/podman/podman/libs/errors.py @@ -50,10 +50,10 @@ class PodmanError(VarlinkErrorProxy): ERROR_MAP = { - 'io.projectatomic.podman.ContainerNotFound': ContainerNotFound, - 'io.projectatomic.podman.ErrorOccurred': ErrorOccurred, - 'io.projectatomic.podman.ImageNotFound': ImageNotFound, - 'io.projectatomic.podman.RuntimeError': PodmanError, + 'io.containers.podman.ContainerNotFound': ContainerNotFound, + 'io.containers.podman.ErrorOccurred': ErrorOccurred, + 'io.containers.podman.ImageNotFound': ImageNotFound, + 'io.containers.podman.RuntimeError': PodmanError, } diff --git a/contrib/python/podman/test/test_client.py b/contrib/python/podman/test/test_client.py index 2abc60a249e..d33e10e02f9 100644 --- a/contrib/python/podman/test/test_client.py +++ b/contrib/python/podman/test/test_client.py @@ -15,7 +15,7 @@ def setUp(self): def test_local(self, mock_ping): p = Client( uri='unix:/run/podman', - interface='io.projectatomic.podman', + interface='io.containers.podman', ) self.assertIsInstance(p._client, LocalClient) @@ -27,7 +27,7 @@ def test_local(self, mock_ping): def test_remote(self, mock_ping): p = Client( uri='unix:/run/podman', - interface='io.projectatomic.podman', + interface='io.containers.podman', remote_uri='ssh://user@hostname/run/podmain/podman', identity_file='~/.ssh/id_rsa') diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh index b3d2ba15b65..0d50ab9d4cb 100755 --- a/contrib/python/podman/test/test_runner.sh +++ b/contrib/python/podman/test/test_runner.sh @@ -106,7 +106,7 @@ RUN chmod 755 /tmp/hello.sh ENTRYPOINT ["/tmp/hello.sh"] EOT -export PODMAN_HOST="unix:${TMPDIR}/podman/io.projectatomic.podman" +export PODMAN_HOST="unix:${TMPDIR}/podman/io.containers.podman" PODMAN_ARGS="--storage-driver=vfs \ --root=${TMPDIR}/crio \ --runroot=${TMPDIR}/crio-run \ diff --git a/contrib/python/podman/test/test_tunnel.py b/contrib/python/podman/test/test_tunnel.py index 719a2f9a405..7172777506a 100644 --- a/contrib/python/podman/test/test_tunnel.py +++ b/contrib/python/podman/test/test_tunnel.py @@ -55,7 +55,7 @@ def test_portal_no_reaping(self): def test_tunnel(self, mock_finalize, mock_exists, mock_Popen): context = Context( 'unix:/01', - 'io.projectatomic.podman', + 'io.containers.podman', '/tmp/user/socket', '/run/podman/socket', 'user', diff --git a/contrib/python/pypodman/docs/man1/pypodman.1 b/contrib/python/pypodman/docs/man1/pypodman.1 index 50d88f84d65..1e19bc1e55f 100644 --- a/contrib/python/pypodman/docs/man1/pypodman.1 +++ b/contrib/python/pypodman/docs/man1/pypodman.1 @@ -49,7 +49,7 @@ attempts to connect to \f[C]\-\-remote\-socket\-path\f[] on local host. \f[B]\[en]remote\-socket\-path\f[] .PP Path on remote host for podman service's \f[C]AF_UNIX\f[] socket. The default is -\f[C]/run/podman/io.projectatomic.podman\f[]. +\f[C]/run/podman/io.containers.podman\f[]. .PP \f[B]\[en]identity\-file\f[] .PP @@ -87,7 +87,7 @@ From command line option, for example: \[en]run\-dir This should provide Operators the ability to setup basic configurations and allow users to customize them. .PP -\f[B]XDG_RUNTIME_DIR\f[] (\f[C]XDG_RUNTIME_DIR/io.projectatomic.podman\f[]) +\f[B]XDG_RUNTIME_DIR\f[] (\f[C]XDG_RUNTIME_DIR/io.containers.podman\f[]) .PP Directory where pypodman stores non\-essential runtime files and other file objects (such as sockets, named pipes, \&...). diff --git a/contrib/python/pypodman/pypodman/lib/config.py b/contrib/python/pypodman/pypodman/lib/config.py index 75059fc1553..759081e056c 100644 --- a/contrib/python/pypodman/pypodman/lib/config.py +++ b/contrib/python/pypodman/pypodman/lib/config.py @@ -72,7 +72,7 @@ def initialize_parser(self): '--remote-socket-path', metavar='PATH', help=('path of podman socket on remote host' - ' (default: /run/podman/io.projectatomic.podman)')) + ' (default: /run/podman/io.containers.podman)')) self.add_argument( '--identity-file', metavar='PATH', @@ -165,7 +165,7 @@ def reqattr(name, value): getattr(args, 'remote_socket_path') or os.environ.get('REMOTE_SOCKET_PATH') or config['default'].get('remote_socket_path') - or '/run/podman/io.projectatomic.podman' + or '/run/podman/io.containers.podman' ) # yapf:disable reqattr(