saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 17:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Deprecating and removing salt-unity.

Browse source
This commit is contained in:
Gareth J. Greenaway 2021-11-23 10:49:30 -08:00 • committed by Megan Wilhite
parent a0aabe005d
commit 4b2bce83b8
11 changed files with 0 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/conf.py
View file

@ -348,7 +348,6 @@ man_pages = [
("ref/cli/salt-ssh", "salt-ssh", "salt-ssh Documentation", authors, 1),
("ref/cli/salt-cloud", "salt-cloud", "Salt Cloud Command", authors, 1),
("ref/cli/salt-api", "salt-api", "salt-api Command", authors, 1),
("ref/cli/salt-unity", "salt-unity", "salt-unity Command", authors, 1),
("ref/cli/spm", "spm", "Salt Package Manager Command", authors, 1),
]

67
doc/man/salt-unity.1
View file

@ -1,67 +0,0 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-UNITY" "1" "Sep 27, 2021" "3004" "Salt"
.SH NAME
salt-unity \- salt-unity Command
.
.nr rst2man-indent-level 0
.
.de1 rstReportMargin
\\$1 \\n[an-margin]
level \\n[rst2man-indent-level]
level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
-
\\n[rst2man-indent0]
\\n[rst2man-indent1]
\\n[rst2man-indent2]
..
.de1 INDENT
.\" .rstReportMargin pre:
. RS \\$1
. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
. nr rst2man-indent-level +1
.\" .rstReportMargin post:
..
.de UNINDENT
. RE
.\" indent \\n[an-margin]
.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
.nr rst2man-indent-level -1
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
.sp
A unified invocation wrapper around other Salt CLI scripts.
.SH SYNOPSIS
.INDENT 0.0
.INDENT 3.5
.sp
.nf
.ft C
salt\-unity salt \(aq*\(aq test.version
.ft P
.fi
.UNINDENT
.UNINDENT
.SH DESCRIPTION
.sp
This script takes an argument which is one of the other Salt CLI scripts and
invokes that script.
.SH OPTIONS
.SH SEE ALSO
.sp
\fBsalt\-api(1)\fP
\fBsalt\-call(1)\fP
\fBsalt\-cloud(1)\fP
\fBsalt\-cp(1)\fP
\fBsalt\-key(1)\fP
\fBsalt\-main(1)\fP
\fBsalt\-master(1)\fP
\fBsalt\-minion(1)\fP
\fBsalt\-run(1)\fP
\fBsalt\-ssh(1)\fP
\fBsalt\-syndic(1)\fP
.SH AUTHOR
Thomas S. Hatch <thatch45@gmail.com> and many others, please see the Authors file
.\" Generated by docutils manpage writer.
.

6
doc/ref/cli/index.rst
View file

@ -80,12 +80,6 @@ salt-syndic
salt-syndic
salt-unity
==========
.. toctree::
salt-unity
spm
===
.. toctree::

38
doc/ref/cli/salt-unity.rst
View file

@ -1,38 +0,0 @@
==============
``salt-unity``
==============
A unified invocation wrapper around other Salt CLI scripts.
Synopsis
========
.. code-block:: bash
salt-unity salt '*' test.version
Description
===========
This script takes an argument which is one of the other Salt CLI scripts and
invokes that script.
Options
=======
.. program:: salt-unity
See also
========
:manpage:`salt-api(1)`
:manpage:`salt-call(1)`
:manpage:`salt-cloud(1)`
:manpage:`salt-cp(1)`
:manpage:`salt-key(1)`
:manpage:`salt-main(1)`
:manpage:`salt-master(1)`
:manpage:`salt-minion(1)`
:manpage:`salt-run(1)`
:manpage:`salt-ssh(1)`
:manpage:`salt-syndic(1)`

2
pkg/rpm/salt.spec
View file

@ -255,13 +255,11 @@ rm -rf %{buildroot}
%doc %{_mandir}/man1/salt-key.1.*
%doc %{_mandir}/man1/salt-master.1.*
%doc %{_mandir}/man1/salt-run.1.*
%doc %{_mandir}/man1/salt-unity.1.*
%{_bindir}/salt
%{_bindir}/salt-cp
%{_bindir}/salt-key
%{_bindir}/salt-master
%{_bindir}/salt-run
%{_bindir}/salt-unity
%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15)
%attr(0755, root, root) %{_initrddir}/salt-master
%else

2
pkg/suse/salt.spec
View file

@ -772,8 +772,6 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/salt.conf || true
%defattr(-,root,root,-)
%{_bindir}/spm
%{_bindir}/salt-call
%{_bindir}/salt-unity
%{_mandir}/man1/salt-unity.1.gz
%{_mandir}/man1/salt-call.1.gz
%config(noreplace) %{_sysconfdir}/logrotate.d/salt
%{python_sitelib}/*

2
pkg/windows/build_pkg.bat
View file

@ -582,8 +582,6 @@ If Exist "%BinDir%\Lib\site-packages\salt\states\zpool.py"^
:: Remove Unneeded Components
If Exist "%BinDir%\Lib\site-packages\salt\cloud"^
rd /S /Q "%BinDir%\Lib\site-packages\salt\cloud" 1>nul
If Exist "%BinDir%\Scripts\salt-unity*"^
del /Q "%BinDir%\Scripts\salt-unity*" 1>nul
@echo.

6
scripts/salt-unity
View file

@ -1,6 +0,0 @@
#!/usr/bin/env python3
from salt.scripts import salt_unity
if __name__ == "__main__":
salt_unity()

7
setup.py
View file

@ -902,7 +902,6 @@ class SaltDistribution(distutils.dist.Distribution):
* salt-cp
* salt-minion
* salt-syndic
* salt-unity
* spm
When packaged for salt-ssh, the following scripts should be installed:
@ -1152,7 +1151,6 @@ class SaltDistribution(distutils.dist.Distribution):
"doc/man/salt-key.1",
"doc/man/salt-minion.1",
"doc/man/salt-syndic.1",
"doc/man/salt-unity.1",
"doc/man/spm.1",
]
)
@ -1172,7 +1170,6 @@ class SaltDistribution(distutils.dist.Distribution):
"doc/man/salt.1",
"doc/man/salt-ssh.1",
"doc/man/salt-syndic.1",
"doc/man/salt-unity.1",
]
)
return data_files
@ -1236,7 +1233,6 @@ class SaltDistribution(distutils.dist.Distribution):
"scripts/salt-key",
"scripts/salt-minion",
"scripts/salt-syndic",
"scripts/salt-unity",
"scripts/spm",
]
)
@ -1255,7 +1251,6 @@ class SaltDistribution(distutils.dist.Distribution):
"scripts/salt-proxy",
"scripts/salt-ssh",
"scripts/salt-syndic",
"scripts/salt-unity",
"scripts/spm",
]
)
@ -1283,7 +1278,6 @@ class SaltDistribution(distutils.dist.Distribution):
"salt-key = salt.scripts:salt_key",
"salt-minion = salt.scripts:salt_minion",
"salt-syndic = salt.scripts:salt_syndic",
"salt-unity = salt.scripts:salt_unity",
"spm = salt.scripts:salt_spm",
]
)
@ -1301,7 +1295,6 @@ class SaltDistribution(distutils.dist.Distribution):
"salt-minion = salt.scripts:salt_minion",
"salt-ssh = salt.scripts:salt_ssh",
"salt-syndic = salt.scripts:salt_syndic",
"salt-unity = salt.scripts:salt_unity",
"spm = salt.scripts:salt_spm",
]
)

2
tests/pkg/rpm/salt.spec
View file

@ -282,13 +282,11 @@ rm -rf %{buildroot}
%doc %{_mandir}/man1/salt-key.1.*
%doc %{_mandir}/man1/salt-master.1.*
%doc %{_mandir}/man1/salt-run.1.*
%doc %{_mandir}/man1/salt-unity.1.*
%{_bindir}/salt
%{_bindir}/salt-cp
%{_bindir}/salt-key
%{_bindir}/salt-master
%{_bindir}/salt-run
%{_bindir}/salt-unity
%if ! (0%{?rhel} >= 7 || 0%{?fedora} >= 15)
%attr(0755, root, root) %{_initrddir}/salt-master
%else

1
tests/pytests/scenarios/setup/test_man.py
View file

@ -33,7 +33,6 @@ def test_man_pages(virtualenv, src_dir):
"salt-api Command",
"Start interfaces used to remotely connect",
],
"salt-unity.1": ["salt-unity Command", "unified invocation wrapper"],
"salt-syndic.1": ["salt-syndic Documentation", "Salt syndic daemon"],
"salt-ssh.1": ["salt-ssh Documentation", "executed using only SSH"],
"salt-run.1": ["salt-run Documentation", "frontend command for executing"],