author | Patrick Einheber <patrick.einheber@oracle.com> |
Thu, 22 Sep 2016 07:45:05 -0700 | |
changeset 6958 | 864721a3146f |
parent 6665 | 9dbe2f1926b4 |
permissions | -rw-r--r-- |
5323 | 1 |
Changes needed in server.cfg, mainly : |
2 |
Making use of RabbitMQ (default is ActiveMQ) |
|
5749
194929aecdf7
23076287 server and client.cfg logfile entry is not quite right
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
5513
diff
changeset
|
3 |
The default port used to connect to RabbitMQ is 61613 |
5323 | 4 |
Default user : 'mcollective' & passwd : 'changeme' |
5749
194929aecdf7
23076287 server and client.cfg logfile entry is not quite right
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
5513
diff
changeset
|
5 |
Change RabbitMQ to log to /dev/stderr, so it goes to the SMF log |
6958
864721a3146f
23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents:
6665
diff
changeset
|
6 |
Set the PSK type explicitly to UID and the default to 'changeme' |
5323 | 7 |
|
6958
864721a3146f
23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents:
6665
diff
changeset
|
8 |
--- marionette-collective-2.8.8/etc/server.cfg.dist.orig 2016-09-19 08:51:05.719526817 -0700 |
864721a3146f
23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents:
6665
diff
changeset
|
9 |
+++ marionette-collective-2.8.8/etc/server.cfg.dist 2016-09-19 08:51:49.506159302 -0700 |
864721a3146f
23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents:
6665
diff
changeset
|
10 |
@@ -1,20 +1,28 @@ |
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5749
diff
changeset
|
11 |
+####################################################################### |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5749
diff
changeset
|
12 |
+# Oracle has modified the originally distributed contents of this file. |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5749
diff
changeset
|
13 |
+####################################################################### |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5749
diff
changeset
|
14 |
+ |
5323 | 15 |
main_collective = mcollective |
16 |
collectives = mcollective |
|
17 |
-libdir = /usr/libexec/mcollective |
|
18 |
-logfile = /var/log/mcollective.log |
|
19 |
+libdir = /usr/share/mcollective |
|
5513
a25ccbe6d0ea
22649883 mcollective client.cfg and server.cfg should log to SMF service log
Matt Keenan <matt.keenan@oracle.com>
parents:
5323
diff
changeset
|
20 |
+logger_type = file |
5749
194929aecdf7
23076287 server and client.cfg logfile entry is not quite right
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
5513
diff
changeset
|
21 |
+# Send output to SMF service log |
194929aecdf7
23076287 server and client.cfg logfile entry is not quite right
Andrew Balfour <Andrew.Balfour@Oracle.COM>
parents:
5513
diff
changeset
|
22 |
+logfile = /dev/stderr |
5323 | 23 |
loglevel = info |
24 |
daemonize = 1 |
|
5513
a25ccbe6d0ea
22649883 mcollective client.cfg and server.cfg should log to SMF service log
Matt Keenan <matt.keenan@oracle.com>
parents:
5323
diff
changeset
|
25 |
|
6958
864721a3146f
23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents:
6665
diff
changeset
|
26 |
# Plugins |
5323 | 27 |
securityprovider = psk |
6958
864721a3146f
23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents:
6665
diff
changeset
|
28 |
-plugin.psk = unset |
864721a3146f
23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents:
6665
diff
changeset
|
29 |
+plugin.psk = changeme |
864721a3146f
23019017 clone archives should remove sensitive puppet configuration data
Patrick Einheber <patrick.einheber@oracle.com>
parents:
6665
diff
changeset
|
30 |
+plugin.psk.callertype = uid |
5513
a25ccbe6d0ea
22649883 mcollective client.cfg and server.cfg should log to SMF service log
Matt Keenan <matt.keenan@oracle.com>
parents:
5323
diff
changeset
|
31 |
|
5323 | 32 |
-connector = activemq |
33 |
-plugin.activemq.pool.size = 1 |
|
34 |
-plugin.activemq.pool.1.host = stomp1 |
|
35 |
-plugin.activemq.pool.1.port = 6163 |
|
36 |
-plugin.activemq.pool.1.user = mcollective |
|
37 |
-plugin.activemq.pool.1.password = marionette |
|
38 |
+connector = rabbitmq |
|
39 |
+plugin.rabbitmq.vhost = /mco |
|
40 |
+plugin.rabbitmq.pool.size = 1 |
|
41 |
+plugin.rabbitmq.pool.1.host = localhost |
|
42 |
+plugin.rabbitmq.pool.1.port = 61613 |
|
43 |
+plugin.rabbitmq.pool.1.user = mcollective |
|
44 |
+plugin.rabbitmq.pool.1.password = changeme |
|
5513
a25ccbe6d0ea
22649883 mcollective client.cfg and server.cfg should log to SMF service log
Matt Keenan <matt.keenan@oracle.com>
parents:
5323
diff
changeset
|
45 |
|
5323 | 46 |
# Facts |
47 |
factsource = yaml |