author | Shawn Ferry <shawn.ferry@oracle.com> |
Mon, 28 Nov 2016 16:54:02 -0800 | |
changeset 7565 | 48aa82a0931f |
permissions | -rw-r--r-- |
7565
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
1 |
#!/usr/bin/bash -e |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
2 |
. /lib/svc/share/smf_include.sh |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
3 |
|
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
4 |
# Get Puppet 4 upgrade flag |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
5 |
PUP4_X=$(/usr/bin/svcprop -p upgrade/4.x $SMF_FMRI) |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
6 |
|
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
7 |
# Get list of puppet FMRIs |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
8 |
readarray -t PUPPET_FMRI <<< "$(svcs -H -o fmri application/puppet)" |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
9 |
|
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
10 |
# Properties to remove if set |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
11 |
PUPPET_RM_PROP=( |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
12 |
stringify_facts trusted_node_data allow_variables_with_dashes |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
13 |
async_storeconfigs binder catalog_format certdnsnames |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
14 |
certificate_expire_warning couchdb_url dbadapter dbconnections |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
15 |
dblocation dbmigrate dbname dbpassword dbport dbserver dbsocket |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
16 |
dbuser dynamicfacts http_compression httplog ignoreimport |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
17 |
immutable_node_data inventory_port inventory_server |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
18 |
inventory_terminus legacy_query_parameter_serialization listen |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
19 |
localconfig manifestdir masterlog parser preview_outputdir puppetport |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
20 |
queue_source queue_type rails_loglevel railslog report_serialization_format |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
21 |
reportfrom rrddir rrdinterval sendmail smtphelo smtpport smtpserver |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
22 |
stringify_facts tagmap templatedir thin_storeconfigs trusted_node_data zlib |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
23 |
disable_warnings classfile vardir libdir rundir confdir ssldir) |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
24 |
|
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
25 |
# If additional migrations are needed in the future use a new prop |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
26 |
# and variable for the steps |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
27 |
if [ "$PUP4_X" == "true" ] ; then |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
28 |
exit $SMF_EXIT_OK |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
29 |
fi |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
30 |
if [ "$PUP4_X" == "false" ]; then |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
31 |
echo "Updating settings for Puppet 4" |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
32 |
echo "Removing Out of Date Configuration Options" |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
33 |
for fmri in ${PUPPET_FMRI[@]} |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
34 |
do |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
35 |
for prop in ${PUPPET_RM_PROP[@]} |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
36 |
do |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
37 |
printf "%s: " ${fmri}/:properties/config/${prop} |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
38 |
# Don't exit on error |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
39 |
set +e |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
40 |
tmp=$(svcprop ${fmri}/:properties/config/${prop} 2> /dev/null) |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
41 |
if [ ! -z ${tmp} ]; then |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
42 |
svccfg -s $fmri delprop config/${prop} > /dev/null 2>&1 |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
43 |
# Reset exit on error |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
44 |
print "removed (${tmp})" |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
45 |
else |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
46 |
print "not present" |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
47 |
fi |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
48 |
set -e |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
49 |
done |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
50 |
done |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
51 |
fi |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
52 |
svccfg -s $SMF_FMRI setprop upgrade/4.x = true |
48aa82a0931f
PSARC/2016/607 Puppet 4.7.0, Hiera 3.2.0
Shawn Ferry <shawn.ferry@oracle.com>
parents:
diff
changeset
|
53 |
svccfg -s $SMF_FMRI refresh |