Browse code

salt3: Removing salt3 suppport from Photon 5.0

Change-Id: Icc336e157fd5c8c2e4752730de863b130c9f0a94
Signed-off-by: Tapas Kundu <tkundu@vmware.com>
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/20071
Tested-by: gerrit-photon <photon-checkins@vmware.com>

Tapas Kundu authored on 2023/03/22 14:29:48
Showing 7 changed files
1 1
deleted file mode 100644
... ...
@@ -1,39 +0,0 @@
1
-/var/log/salt/master {
2
-    weekly
3
-    missingok
4
-    rotate 5
5
-    compress
6
-    notifempty
7
-}
8
-
9
-/var/log/salt/minion {
10
-    weekly
11
-    missingok
12
-    rotate 5
13
-    compress
14
-    notifempty
15
-}
16
-
17
-/var/log/salt/key {
18
-    weekly
19
-    missingok
20
-    rotate 5
21
-    compress
22
-    notifempty
23
-}
24
-
25
-/var/log/salt/cloud {
26
-    weekly
27
-    missingok
28
-    rotate 5
29
-    compress
30
-    notifempty
31
-}
32
-
33
-/var/log/salt/ssh {
34
-    weekly
35
-    missingok
36
-    rotate 5
37
-    compress
38
-    notifempty
39
-}
40 1
deleted file mode 100644
... ...
@@ -1,6 +0,0 @@
1
-diff --git a/requirements/base.txt b/requirements/base.txt
2
-index 96037ccf14..712dcca023 100644
3
-+++ b/requirements/base.txt
4
-@@ -7 +6,0 @@ distro>=1.0.1
5
--contextvars
6 1
deleted file mode 100644
... ...
@@ -1,14 +0,0 @@
1
-[Unit]
2
-Description=The Salt API
3
-Documentation=man:salt-api(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltproject.io/en/latest/contents.html
4
-After=network.target
5
-
6
-[Service]
7
-Type=notify
8
-NotifyAccess=all
9
-LimitNOFILE=8192
10
-ExecStart=/usr/bin/salt-api
11
-TimeoutStopSec=3
12
-
13
-[Install]
14
-WantedBy=multi-user.target
15 1
deleted file mode 100644
... ...
@@ -1,13 +0,0 @@
1
-[Unit]
2
-Description=The Salt Master Server
3
-Documentation=man:salt-master(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltproject.io/en/latest/contents.html
4
-After=network.target
5
-
6
-[Service]
7
-LimitNOFILE=100000
8
-Type=notify
9
-NotifyAccess=all
10
-ExecStart=/usr/bin/salt-master
11
-
12
-[Install]
13
-WantedBy=multi-user.target
14 1
deleted file mode 100644
... ...
@@ -1,14 +0,0 @@
1
-[Unit]
2
-Description=The Salt Minion
3
-Documentation=man:salt-minion(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltproject.io/en/latest/contents.html
4
-After=network.target salt-master.service
5
-
6
-[Service]
7
-KillMode=process
8
-Type=notify
9
-NotifyAccess=all
10
-LimitNOFILE=8192
11
-ExecStart=/usr/bin/salt-minion
12
-
13
-[Install]
14
-WantedBy=multi-user.target
15 1
deleted file mode 100644
... ...
@@ -1,14 +0,0 @@
1
-[Unit]
2
-Description=The Salt Master Server
3
-Documentation=man:salt-syndic(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltproject.io/en/latest/contents.html
4
-After=network.target
5
-PartOf=salt-master.service
6
-
7
-[Service]
8
-Type=notify
9
-NotifyAccess=all
10
-LimitNOFILE=8192
11
-ExecStart=/usr/bin/salt-syndic
12
-
13
-[Install]
14
-WantedBy=multi-user.target
15 1
deleted file mode 100644
... ...
@@ -1,340 +0,0 @@
1
-%global include_tests 1
2
-
3
-%define _salttesting_ver 2016.5.11
4
-
5
-Name:           salt3
6
-Version:        3005.1
7
-Release:        2%{?dist}
8
-Summary:        A parallel remote execution system with python3
9
-Group:          System Environment/Daemons
10
-License:        ASL 2.0
11
-URL:            http://saltstack.org
12
-Vendor:         VMware, Inc.
13
-Distribution:   Photon
14
-
15
-Source0: https://github.com/saltstack/salt/releases/download/v%{version}/salt-%{version}.tar.gz
16
-%define sha512 salt=391f995f0129f3d7104a0eea4fd83b18aa6ecae0fd7a2c77c1154e24b0bcd52cef4b63db12597c85737bb33ddf605e0c23370cef3bf47f9ea85af5b77d74dc50
17
-
18
-Source1: https://pypi.python.org/packages/source/S/SaltTesting/SaltTesting-%{_salttesting_ver}.tar.gz
19
-%define sha512 SaltTesting=5fc362ba6cf41efd0d3197c832f05b14267c9d92bbb0c34d872bd3ae1383996e0918dc6b01052076ecea70bbf4687fde3d5de2915aab7d07f961f2b6badac6ff
20
-
21
-Source2:        salt-master.service
22
-Source3:        salt-syndic.service
23
-Source4:        salt-minion.service
24
-Source5:        salt-api.service
25
-Source6:        logrotate.salt
26
-
27
-Patch0:         requirements.patch
28
-
29
-BuildArch:      noarch
30
-
31
-BuildRequires:  python3-devel
32
-BuildRequires:  python3-setuptools
33
-BuildRequires:  systemd-devel
34
-BuildRequires:  python3-distro
35
-
36
-Requires:       pciutils
37
-Requires:       python3-pycryptodomex
38
-Requires:       python3-jinja2
39
-Requires:       python3-msgpack
40
-Requires:       python3-PyYAML
41
-Requires:       python3-requests
42
-Requires:       python3-zmq
43
-Requires:       python3-tornado
44
-Requires:       python3-psutil
45
-
46
-%ifarch x86_64
47
-Requires:       dmidecode
48
-%endif
49
-
50
-%description
51
-Salt is a distributed remote execution system used to execute commands and
52
-query data. It was developed in order to bring the best solutions found in
53
-the world of remote execution together and make them better, faster and more
54
-malleable. Salt accomplishes this via its ability to handle larger loads of
55
-information, and not just dozens, but hundreds or even thousands of individual
56
-servers, handle them quickly and through a simple and manageable interface.
57
-
58
-%package        master
59
-Summary:        Management component for salt, a parallel remote execution system with python3
60
-Group:          System Environment/Daemons
61
-Requires:       %{name} = %{version}-%{release}
62
-
63
-%description    master
64
-The Salt master is the central server to which all minions connect.
65
-
66
-%package        minion
67
-Summary:        Client component for Salt, a parallel remote execution system
68
-Group:          System Environment/Daemons
69
-Requires:       %{name} = %{version}-%{release}
70
-
71
-%description    minion
72
-The Salt minion is the agent component of Salt. It listens for instructions
73
-from the master, runs jobs, and returns results back to the master.
74
-
75
-%package        syndic
76
-Summary:        Master-of-master component for Salt, a parallel remote execution system
77
-Group:          System Environment/Daemons
78
-Requires:       %{name} = %{version}-%{release}
79
-
80
-%description    syndic
81
-The Salt syndic is a master daemon which can receive instruction from a
82
-higher-level master, allowing for tiered organization of your Salt
83
-infrastructure.
84
-
85
-%package        api
86
-Summary:        REST API for Salt, a parallel remote execution system
87
-Group:          System administration tools
88
-Requires:       %{name}-master = %{version}-%{release}
89
-
90
-%description    api
91
-salt-api provides a REST interface to the Salt master.
92
-
93
-%package        cloud
94
-Summary:        Cloud provisioner for Salt, a parallel remote execution system
95
-Group:          System administration tools
96
-Requires:       %{name}-master = %{version}-%{release}
97
-
98
-%description    cloud
99
-The salt-cloud tool provisions new cloud VMs, installs salt-minion on them, and
100
-adds them to the master's collection of controllable minions.
101
-
102
-%package        ssh
103
-Summary:        Agentless SSH-based version of Salt, a parallel remote execution system
104
-Group:          System administration tools
105
-Requires:       %{name} = %{version}-%{release}
106
-
107
-%description    ssh
108
-The salt-ssh tool can run remote execution functions and states without the use
109
-of an agent (salt-minion) service.
110
-
111
-%package        proxy
112
-Summary:        Command Proxy of Salt, a parallel remote execution system
113
-Group:          System administration tools
114
-Requires:       %{name} = %{version}-%{release}
115
-
116
-%description    proxy
117
-Receives commands from a Salt master and proxies these commands to devices
118
-that are unable to run a full minion.
119
-
120
-%package spm
121
-Summary:        Salt Package Manager of Salt, a parallel remote execution system
122
-Group:          System administration tools
123
-Requires:       %{name} = %{version}-%{release}
124
-
125
-%description    spm
126
-Salt Package Manager
127
-
128
-%prep
129
-%autosetup -n salt-%{version} -p1
130
-
131
-%build
132
-%{py3_build}
133
-
134
-%install
135
-%{py3_install}
136
-
137
-# Add some directories
138
-install -d -m 0755 %{buildroot}%{_var}/cache/salt
139
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt
140
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.conf.d
141
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.deploy.d
142
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.maps.d
143
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.profiles.d
144
-install -d -m 0755 %{buildroot}%{_sysconfdir}/salt/cloud.providers.d
145
-
146
-# Add the config files
147
-install -p -m 0640 conf/minion %{buildroot}%{_sysconfdir}/salt/minion
148
-install -p -m 0640 conf/master %{buildroot}%{_sysconfdir}/salt/master
149
-install -p -m 0640 conf/cloud %{buildroot}%{_sysconfdir}/salt/cloud
150
-install -p -m 0640 conf/roster %{buildroot}%{_sysconfdir}/salt/roster
151
-
152
-mkdir -p %{buildroot}%{_unitdir}
153
-install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/
154
-install -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/
155
-install -p -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/
156
-install -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/
157
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
158
-install -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/salt
159
-
160
-%clean
161
-rm -rf %{buildroot}
162
-
163
-%preun master
164
-%if 0%{?systemd_preun}
165
-  %systemd_preun salt-master.service
166
-%else
167
-  if [ $1 -eq 0 ] ; then
168
-    # Package removal, not upgrade
169
-    %{_bindir}/systemctl --no-reload disable salt-master.service > /dev/null 2>&1 || :
170
-    %{_bindir}/systemctl stop salt-master.service > /dev/null 2>&1 || :
171
-  fi
172
-%endif
173
-
174
-%preun syndic
175
-%if 0%{?systemd_preun}
176
-  %systemd_preun salt-syndic.service
177
-%else
178
-  if [ $1 -eq 0 ] ; then
179
-    # Package removal, not upgrade
180
-    %{_bindir}/systemctl --no-reload disable salt-syndic.service > /dev/null 2>&1 || :
181
-    %{_bindir}/systemctl stop salt-syndic.service > /dev/null 2>&1 || :
182
-  fi
183
-%endif
184
-
185
-%preun minion
186
-%if 0%{?systemd_preun}
187
-  %systemd_preun salt-minion.service
188
-%else
189
-  if [ $1 -eq 0 ] ; then
190
-    # Package removal, not upgrade
191
-    %{_bindir}/systemctl --no-reload disable salt-minion.service > /dev/null 2>&1 || :
192
-    %{_bindir}/systemctl stop salt-minion.service > /dev/null 2>&1 || :
193
-  fi
194
-%endif
195
-
196
-%post master
197
-%if 0%{?systemd_post}
198
-  %systemd_post salt-master.service
199
-%else
200
-  %{_bindir}/systemctl daemon-reload &>/dev/null || :
201
-%endif
202
-
203
-%post minion
204
-%if 0%{?systemd_post}
205
-  %systemd_post salt-minion.service
206
-%else
207
-  %{_bindir}/systemctl daemon-reload &>/dev/null || :
208
-%endif
209
-
210
-%postun master
211
-%if 0%{?systemd_post}
212
-  %systemd_postun salt-master.service
213
-%else
214
-  %{_bindir}/systemctl daemon-reload &>/dev/null
215
-  [ $1 -gt 0 ] && %{_bindir}/systemctl try-restart salt-master.service &>/dev/null || :
216
-%endif
217
-
218
-%postun syndic
219
-%if 0%{?systemd_post}
220
-  %systemd_postun salt-syndic.service
221
-%else
222
-  %{_bindir}/systemctl daemon-reload &>/dev/null
223
-  [ $1 -gt 0 ] && %{_bindir}/systemctl try-restart salt-syndic.service &>/dev/null || :
224
-%endif
225
-
226
-%postun minion
227
-%if 0%{?systemd_post}
228
-  %systemd_postun salt-minion.service
229
-%else
230
-  %{_bindir}/systemctl daemon-reload &>/dev/null
231
-  [ $1 -gt 0 ] && %{_bindir}/systemctl try-restart salt-minion.service &>/dev/null || :
232
-%endif
233
-
234
-%files
235
-%defattr(-,root,root,-)
236
-%{python3_sitelib}/salt/*
237
-%{python3_sitelib}/salt-*-py%{python3_version}.egg-info
238
-%{_sysconfdir}/logrotate.d/salt
239
-%{_var}/cache/salt
240
-
241
-%files master
242
-%defattr(-,root,root)
243
-%doc %{_mandir}/man7/salt.7.*
244
-%doc %{_mandir}/man1/salt-cp.1.*
245
-%doc %{_mandir}/man1/salt-key.1.*
246
-%doc %{_mandir}/man1/salt-master.1.*
247
-%doc %{_mandir}/man1/salt-run.1.*
248
-%doc %{_mandir}/man1/salt.1.*
249
-%{_bindir}/salt
250
-%{_bindir}/salt-cp
251
-%{_bindir}/salt-key
252
-%{_bindir}/salt-master
253
-%{_bindir}/salt-run
254
-%config(noreplace) %{_unitdir}/salt-master.service
255
-%config(noreplace) %{_sysconfdir}/salt/master
256
-
257
-%files minion
258
-%defattr(-,root,root)
259
-%doc %{_mandir}/man1/salt-call.1.*
260
-%doc %{_mandir}/man1/salt-minion.1.*
261
-%{_bindir}/salt-minion
262
-%{_bindir}/salt-call
263
-%config(noreplace) %{_unitdir}/salt-minion.service
264
-%config(noreplace) %{_sysconfdir}/salt/minion
265
-
266
-%files syndic
267
-%defattr(-,root,root)
268
-%doc %{_mandir}/man1/salt-syndic.1.*
269
-%{_bindir}/salt-syndic
270
-%config(noreplace) %{_unitdir}/salt-syndic.service
271
-
272
-%files api
273
-%defattr(-,root,root)
274
-%doc %{_mandir}/man1/salt-api.1.*
275
-%{_bindir}/salt-api
276
-%config(noreplace) %{_unitdir}/salt-api.service
277
-
278
-%files cloud
279
-%defattr(-,root,root)
280
-%doc %{_mandir}/man1/salt-cloud.1.*
281
-%{_bindir}/salt-cloud
282
-%{_sysconfdir}/salt/cloud.conf.d
283
-%{_sysconfdir}/salt/cloud.deploy.d
284
-%{_sysconfdir}/salt/cloud.maps.d
285
-%{_sysconfdir}/salt/cloud.profiles.d
286
-%{_sysconfdir}/salt/cloud.providers.d
287
-%config(noreplace) %{_sysconfdir}/salt/cloud
288
-
289
-%files ssh
290
-%defattr(-,root,root)
291
-%doc %{_mandir}/man1/salt-ssh.1.*
292
-%{_bindir}/salt-ssh
293
-%{_sysconfdir}/salt/roster
294
-
295
-%files proxy
296
-%defattr(-,root,root)
297
-%doc %{_mandir}/man1/salt-proxy.1.*
298
-%{_bindir}/salt-proxy
299
-
300
-%files spm
301
-%defattr(-,root,root)
302
-%doc %{_mandir}/man1/spm.1.*
303
-%{_bindir}/spm
304
-
305
-%changelog
306
-* Wed Jan 11 2023 Prashant S Chauhan <psinghchauha@vmware.com> 3005.1-2
307
-- Remove python3-backports_abc from Requires
308
-* Tue Oct 04 2022 Derek Ardolf <saltstack_operations@vmware.com> 3005.1-1
309
-- Update to version 3005.1
310
-* Tue Aug 23 2022 Derek Ardolf <saltstack_operations@vmware.com> 3005-1
311
-- Update to version 3005
312
-* Tue Mar 29 2022 Kirill Ponomarev <kponomarev@vmware.com> 3004.1-1
313
-- Update to version 3004.1
314
-* Sat Dec 18 2021 Shreenidhi Shedi <sshedi@vmware.com> 3004-2
315
-- Bump version as a part of requests & chardet upgrade
316
-* Mon Oct 18 2021 Bryce Larson <brycel@vmware.com> 3004-1
317
-- Update to version 3004
318
-* Wed Aug 11 2021 Bryce Larson <brycel@vmware.com> 3003.3-1
319
-- Update to version 3003.3
320
-* Wed Aug 11 2021 Bryce Larson <brycel@vmware.com> 3003.2-1
321
-- Update to version 3003.2
322
-* Fri Jul 23 2021 Bryce Larson <brycel@vmware.com> 3003.1-1
323
-- Update to version 3003.1
324
-* Tue Jun 15 2021 Keerthana K <keerthanak@vmware.com> 3003-1
325
-- Update to version 3003
326
-* Wed Feb 03 2021 Tapas Kundu <tkundu@vmware.com> 3001.1-2
327
-- Depends on pycrptodomex instead of pycrypto
328
-* Wed Aug 19 2020 Gerrit Photon <photon-checkins@vmware.com> 3001.1-1
329
-- Automatic Version Bump
330
-* Mon Jul 27 2020 Tapas Kundu <tkundu@vmware.com> 2019.2.5-1
331
-- Fix issue with distro
332
-* Tue May 12 2020 Keerthana K <keerthanak@vmware.com> 2019.2.4-1
333
-- Update to version 2019.2.4 to fix CVE-2020-11651 CVE-2020-11652.
334
-* Fri Dec 13 2019 Vinothkumar D <vinothkumard@vmware.com> 2019.2.0-1
335
-- Upgrade to version 2019.2.0.
336
-* Mon Jan 21 2019 Vinothkumar D <vinothkumard@vmware.com> 2018.3.2-1
337
-- Downgrade to version 2018.3.2.
338
-* Tue Dec 04 2018 Vinothkumar D <vinothkumard@vmware.com> 2018.3.3-1
339
-- This is an initial version of salt with python3 support for Photon OS
340
-  The source is from https://github.com/saltstack/salt/archive/v2018.3.3.tar.gz