Differential D1059

Add more packages to map
ClosedPublic
Actions

Authored by dereckson on Oct 15 2017, 22:19.

Tags

None

Referenced Files

	F2991249: D1059.id2715.diff
	Sun, May 26, 03:21

	Unknown Object (File)
	Fri, May 24, 23:54

	Unknown Object (File)
	Thu, May 23, 14:44

	Unknown Object (File)
	Thu, May 23, 09:09

	Unknown Object (File)
	Thu, May 23, 09:08

	Unknown Object (File)
	Thu, May 23, 09:02

	Unknown Object (File)
	Thu, May 23, 09:01

	Unknown Object (File)
	Thu, May 23, 08:59

Subscribers

None

Details

Reviewers

Commits

rOPS0dcb9e885a82: Add more packages to map

Summary

38b7d85c introduced a jinja map for directories,
2995a8f6 more recently added an entry for packages too.

This change adds more packages to this new entry,
to get rid of some if condition by OS or family.

Test Plan

Ensure the edited states are no-op (see P264).

Diff Detail

Repository

rOPS Nasqueron Operations

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

dereckson created this revision.Oct 15 2017, 22:19

Harbormaster completed remote builds in B1668: Diff 2709.Oct 15 2017, 22:19

dereckson planned changes to this revision.Oct 15 2017, 22:22

dereckson added inline comments.

roles/shellserver/userland-software/base.sls
9	jinja, ""

Fix import

Harbormaster completed remote builds in B1669: Diff 2710.Oct 15 2017, 22:23

Fix typo in map.jinja

Harbormaster completed remote builds in B1670: Diff 2711.Oct 15 2017, 22:28

Import clause is code, not variable

Removed orphan endif

Harbormaster completed remote builds in B1672: Diff 2713.Oct 15 2017, 22:32

s/package/packages ; s/aspell/aspell-fr

Harbormaster completed remote builds in B1673: Diff 2714.Oct 15 2017, 22:34

P264 salt-state-test-D1059.txt

1	Script started on Sun Oct 15 22:28:02 2017
2	[1m/opt/nasqueron-operations[m (pkg) ] salt eglide state.apply roles/core/letsencrypt/software test=True
3	[0;32meglide:[0;0m
4	[0;32m----------[0;0m
5	[0;32m ID: letsencrypt_software[0;0m
6	[0;32mFunction: pkg.installed[0;0m
7	[0;32m Name: certbot[0;0m
8	[0;32m Result: True[0;0m
9	[0;32m Comment: Package certbot is already installed[0;0m
10	[0;32m Started: 22:28:27.535079[0;0m
11	[0;32mDuration: 2995.701 ms[0;0m
12	[0;32m Changes: [0;0m
13	[0;32m----------[0;0m
14	[0;32m ID: /var/letsencrypt-auto[0;0m
15	[0;32mFunction: file.directory[0;0m
16	[0;32m Result: True[0;0m
17	[0;32m Comment: The directory /var/letsencrypt-auto is in the correct state[0;0m
18	[0;32m Started: 22:28:30.554724[0;0m
19	[0;32mDuration: 5.099 ms[0;0m
20	[0;32m Changes: [0;0m
21	[0;32m----------[0;0m
22	[0;32m ID: /etc/letsencrypt/cli.ini[0;0m
23	[0;32mFunction: file.managed[0;0m
24	[0;32m Result: True[0;0m
25	[0;32m Comment: The file /etc/letsencrypt/cli.ini is in the correct state[0;0m
26	[0;32m Started: 22:28:30.560873[0;0m
27	[0;32mDuration: 415.221 ms[0;0m
28	[0;32m Changes: [0;0m
29	[0;36m
30	Summary for eglide
31	------------[0;0m
32	[0;32mSucceeded: 3[0;0m
33	[0;36mFailed: 0[0;0m
34	[0;36m------------
35	Total states run: 3[0;0m
36	[0;36mTotal run time: 3.416 s[0;0m
37	[1m/opt/nasqueron-operations[m (pkg) ] salt eglide state.apply roles/core/letsencrypt/software test=True[8D[8P[12D[12P[5D[5P[1@s[1@h[10@ellserver/[1@d[1@a[7@tabase/[1@m[1@y[1@s[1@q[1@l
38	[0;32meglide:[0;0m
39	[0;32m----------[0;0m
40	[0;32m ID: mysql[0;0m
41	[0;32mFunction: pkg.installed[0;0m
42	[0;32m Result: True[0;0m
43	[0;32m Comment: All specified packages are already installed[0;0m
44	[0;32m Started: 22:29:50.199322[0;0m
45	[0;32mDuration: 2986.005 ms[0;0m
46	[0;32m Changes: [0;0m
47	[0;32m----------[0;0m
48	[0;32m ID: full_text_search_stopwords_file[0;0m
49	[0;32mFunction: file.managed[0;0m
50	[0;32m Name: /opt/stopwords.txt[0;0m
51	[0;32m Result: True[0;0m
52	[0;32m Comment: The file /opt/stopwords.txt is in the correct state[0;0m
53	[0;32m Started: 22:29:53.198950[0;0m
54	[0;32mDuration: 156.441 ms[0;0m
55	[0;32m Changes: [0;0m
56	[0;32m----------[0;0m
57	[0;32m ID: mysql_config[0;0m
58	[0;32mFunction: file.managed[0;0m
59	[0;32m Name: /etc/my.cnf[0;0m
60	[0;32m Result: True[0;0m
61	[0;32m Comment: The file /etc/my.cnf is in the correct state[0;0m
62	[0;32m Started: 22:29:53.356419[0;0m
63	[0;32mDuration: 44.788 ms[0;0m
64	[0;32m Changes: [0;0m
65	[0;36m
66	Summary for eglide
67	------------[0;0m
68	[0;32mSucceeded: 3[0;0m
69	[0;36mFailed: 0[0;0m
70	[0;36m------------
71	Total states run: 3[0;0m
72	[0;36mTotal run time: 3.187 s[0;0m
73	…
74	[1m/opt/nasqueron-operations[m (pkg) ] salt eglide state.apply roles/shellserver/userland-software/base test=True
75	[0;32meglide:[0;0m
76	[0;32m----------[0;0m
77	[0;32m ID: shells[0;0m
78	[0;32mFunction: pkg.installed[0;0m
79	[0;32m Result: True[0;0m
80	[0;32m Comment: All specified packages are already installed[0;0m
81	[0;32m Started: 22:34:10.049650[0;0m
82	[0;32mDuration: 2980.876 ms[0;0m
83	[0;32m Changes: [0;0m
84	[0;32m----------[0;0m
85	[0;32m ID: editors[0;0m
86	[0;32mFunction: pkg.installed[0;0m
87	[0;32m Result: True[0;0m
88	[0;32m Comment: All specified packages are already installed[0;0m
89	[0;32m Started: 22:34:13.031858[0;0m
90	[0;32mDuration: 70.548 ms[0;0m
91	[0;32m Changes: [0;0m
92	[0;32m----------[0;0m
93	[0;32m ID: utilities[0;0m
94	[0;32mFunction: pkg.installed[0;0m
95	[0;32m Result: True[0;0m
96	[0;32m Comment: All specified packages are already installed[0;0m
97	[0;32m Started: 22:34:13.103461[0;0m
98	[0;32mDuration: 71.222 ms[0;0m
99	[0;32m Changes: [0;0m
100	[0;32m----------[0;0m
101	[0;32m ID: dev[0;0m
102	[0;32mFunction: pkg.installed[0;0m
103	[0;32m Result: True[0;0m
104	[0;32m Comment: All specified packages are already installed[0;0m
105	[0;32m Started: 22:34:13.175708[0;0m
106	[0;32mDuration: 72.749 ms[0;0m
107	[0;32m Changes: [0;0m
108	[0;32m----------[0;0m
109	[0;32m ID: dev_popular_libs[0;0m
110	[0;32mFunction: pkg.installed[0;0m
111	[0;32m Result: True[0;0m
112	[0;32m Comment: All specified packages are already installed[0;0m
113	[0;32m Started: 22:34:13.249541[0;0m
114	[0;32mDuration: 68.081 ms[0;0m
115	[0;32m Changes: [0;0m
116	[0;32m----------[0;0m
117	[0;32m ID: languages_removed[0;0m
118	[0;32mFunction: pkg.removed[0;0m
119	[0;32m Result: True[0;0m
120	[0;32m Comment: All specified packages are already absent[0;0m
121	[0;32m Started: 22:34:13.318658[0;0m
122	[0;32mDuration: 131.844 ms[0;0m
123	[0;32m Changes: [0;0m
124	[0;32m----------[0;0m
125	[0;32m ID: languages[0;0m
126	[0;32mFunction: pkg.installed[0;0m
127	[0;32m Result: True[0;0m
128	[0;32m Comment: All specified packages are already installed[0;0m
129	[0;32m Started: 22:34:13.451609[0;0m
130	[0;32mDuration: 69.819 ms[0;0m
131	[0;32m Changes: [0;0m
132	[0;32m----------[0;0m
133	[0;32m ID: languages_libs[0;0m
134	[0;32mFunction: pkg.installed[0;0m
135	[0;32m Result: True[0;0m
136	[0;32m Comment: All specified packages are already installed[0;0m
137	[0;32m Started: 22:34:13.522532[0;0m
138	[0;32mDuration: 68.151 ms[0;0m
139	[0;32m Changes: [0;0m
140	[0;32m----------[0;0m
141	[0;32m ID: spelling[0;0m
142	[0;32mFunction: pkg.installed[0;0m
143	[0;32m Result: True[0;0m
144	[0;32m Comment: All specified packages are already installed[0;0m
145	[0;32m Started: 22:34:13.591779[0;0m
146	[0;32mDuration: 68.849 ms[0;0m
147	[0;32m Changes: [0;0m
148	[0;36m
149	Summary for eglide
150	------------[0;0m
151	[0;32mSucceeded: 9[0;0m
152	[0;36mFailed: 0[0;0m
153	[0;36m------------
154	Total states run: 9[0;0m
155	[0;36mTotal run time: 3.602 s[0;0m
156	[1m/opt/nasqueron-operations[m (pkg) ] ^Dexit
157
158	Script done on Sun Oct 15 22:34:33 2017

This revision is now accepted and ready to land.Oct 15 2017, 22:36

Closed by commit rOPS0dcb9e885a82: Add more packages to map (authored by dereckson). · Explain WhyOct 15 2017, 22:37

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

28 lines

roles/

core/

letsencrypt/

9 lines

shellserver/

database/

8 lines

userland-software/

30 lines

Diff 2715

map.jinja

Loading...

roles/core/letsencrypt/software.sls

Loading...

roles/shellserver/database/mysql.sls

Loading...

roles/shellserver/userland-software/base.sls

Loading...