Merge master into wpe enhanced
Denise Unterwurzacher (approved)
Branch: merge-master-into-wpe-enhanced
Branch: wpe-enhanced
Merged
Merged pull request
Merged in merge-master-into-wpe-enhanced (pull request #151)
Merged in merge-master-into-wpe-enhanced (pull request #151)
This is a merge of master into of the current wpe-enhanced branch, to make sure wpe-enhanced is up to date with master when we merge it in.
I’ve been through the changes and have found nothing conflicting. Changes detailed below.
Â
function atl_awsLinuxAmi
now requires a second param which is set in build-ami.sh: export AWS_LINUX_VERSION="2018.03.0". In wpe-aws this is set to '2018.03’ which I think is better - we would want more recent amis (/)It is a new version of AWS linux, for the zfs-install. This is already done in wpe-aws (/)
Â
build-ami also checks that AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY are set - we do this already in the wpe-aws repo’s build-ami-wpe.sh (/)
Â
Confluence template has extra param (will follow up with Maks as to why):
ATL_HAZELCAST_NETWORK_AWS_HOST_HEADER=ec2.amazonaws.com
Â
executedRemoteOperationCount was removed from confluence-collectd.conf - collectd stuff doesn’t work so this is inconsequential (/)
Â
rpm-gpg-key-zfsonlinux was created - it’s used for verifying the signature of the zfs-release package and a change to gpg checking in install-zfs.sh (/)
Â
The Jira template was in JSON and had a bugfix we don’t need (to add a newline in /etc/atl which we are not affected by because we use YAML), and changed the SSLCertificateId from being a concatenation of known params and the SSLCertificateName to requiring the user to enter the full SSLCertificateARN. I do not believe we want this change, so I have not made it in the YAML template.