From 71332d27f3998a94b9a02ace4fa19fbf03580867 Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Fri, 15 Feb 2019 14:05:19 +0100 Subject: [PATCH] (#19) use modern choria, centos 7 and puppet --- ec2environment/cloud-init/common.txt | 2 +- ec2environment/cloud-init/puppet-master.txt | 2 +- ec2environment/puppet/Puppetfile | 3 +-- ec2environment/variables.tf | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ec2environment/cloud-init/common.txt b/ec2environment/cloud-init/common.txt index 9163d3c..71c3a50 100644 --- a/ec2environment/cloud-init/common.txt +++ b/ec2environment/cloud-init/common.txt @@ -9,7 +9,7 @@ users: - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3XZsf4OmqktsCtmGTX91ORpCt34pFS9dGcrvLGhgIacr1pCCz9F/QDghNRdH+LmcpXrzXF5E7yQ0JFn0ICLwpW2ftcY3y+c6qV+NIYpuyQv5IhDrY5HU7n9+Lypive4wtrv2JatXWyI1GheQws8wgM9mcSNL3awEYSfE0LqIK1/Wyh+dQxHUdNOcBBTs/R3Jllrzkb5b0pDHncQLOJy73d68QF5aiWKS7WVpPkxAOCAwXqqfR6egA8HB5CT2tGZlgBIJkxx3pFUEXtCkNQrl7HSmGAc1zeHpUKAfv1z0t5HtL8r/RH7L1uHaSVhrMGfMcFCXQo0ez7l5/otv/TiDGtaSmZL0vaJPeRvzRmMKOf6LMUBGs/IHCe2vErZ/XkBlNCSa2zTvJ+FstBG8i66BrfDGdCv84bYP9AKHULpww+MfWT70xVX+UUkBU8NbjY/t7Nv5mKPsLpfnIhOyty1yKEnTEkfmuJIGBa4chFXIHcNR9wvuuboL1CB95wyKxf/Jw8SGk+Wk5WMFz8/8qpxGriR10BE0+m0SgN+ubhM+wdVl+puap20EOhRlBgiM/LrIdMwsHTtPWtGhKBZK9jLpgg7nhrFmjrpoK155ggArIOd5lYDVIMtRs0a147hxGpS8N3F/Trq4feJ02V+JqBpfVuS9EuM8xkfs1B+22AFC65w== rip@liberate" runcmd: - - "rpm -ivh http://yum.puppetlabs.com/puppet5/puppet-release-el-7.noarch.rpm" + - "rpm -ivh http://yum.puppetlabs.com/puppet6/puppet-release-el-7.noarch.rpm" - "yum -y install puppet-agent git" - "ln -s /opt/puppetlabs/bin/puppet /opt/puppetlabs/bin/facter /opt/puppetlabs/bin/mco /usr/bin/" - "/opt/puppetlabs/bin/puppet resource host puppet ensure=present ip=${puppet_master_ip}" diff --git a/ec2environment/cloud-init/puppet-master.txt b/ec2environment/cloud-init/puppet-master.txt index 57d6a10..23173b9 100644 --- a/ec2environment/cloud-init/puppet-master.txt +++ b/ec2environment/cloud-init/puppet-master.txt @@ -9,7 +9,7 @@ users: - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC3XZsf4OmqktsCtmGTX91ORpCt34pFS9dGcrvLGhgIacr1pCCz9F/QDghNRdH+LmcpXrzXF5E7yQ0JFn0ICLwpW2ftcY3y+c6qV+NIYpuyQv5IhDrY5HU7n9+Lypive4wtrv2JatXWyI1GheQws8wgM9mcSNL3awEYSfE0LqIK1/Wyh+dQxHUdNOcBBTs/R3Jllrzkb5b0pDHncQLOJy73d68QF5aiWKS7WVpPkxAOCAwXqqfR6egA8HB5CT2tGZlgBIJkxx3pFUEXtCkNQrl7HSmGAc1zeHpUKAfv1z0t5HtL8r/RH7L1uHaSVhrMGfMcFCXQo0ez7l5/otv/TiDGtaSmZL0vaJPeRvzRmMKOf6LMUBGs/IHCe2vErZ/XkBlNCSa2zTvJ+FstBG8i66BrfDGdCv84bYP9AKHULpww+MfWT70xVX+UUkBU8NbjY/t7Nv5mKPsLpfnIhOyty1yKEnTEkfmuJIGBa4chFXIHcNR9wvuuboL1CB95wyKxf/Jw8SGk+Wk5WMFz8/8qpxGriR10BE0+m0SgN+ubhM+wdVl+puap20EOhRlBgiM/LrIdMwsHTtPWtGhKBZK9jLpgg7nhrFmjrpoK155ggArIOd5lYDVIMtRs0a147hxGpS8N3F/Trq4feJ02V+JqBpfVuS9EuM8xkfs1B+22AFC65w== rip@liberate" runcmd: - - "rpm -ivh http://yum.puppetlabs.com/puppet5/puppet-release-el-7.noarch.rpm" + - "rpm -ivh http://yum.puppetlabs.com/puppet6/puppet-release-el-7.noarch.rpm" - "yum -y install puppet-agent puppetserver git" - "ln -s /opt/puppetlabs/bin/puppet /opt/puppetlabs/bin/facter /opt/puppetlabs/bin/mco /usr/bin/" - "puppet resource host puppet ensure=present ip=127.0.0.1" diff --git a/ec2environment/puppet/Puppetfile b/ec2environment/puppet/Puppetfile index e0ca6b3..1d07bd2 100644 --- a/ec2environment/puppet/Puppetfile +++ b/ec2environment/puppet/Puppetfile @@ -6,7 +6,6 @@ mod "puppetlabs-stdlib" mod "camptocamp-puppetserver" mod "puppetlabs-puppetdb" mod "puppetlabs-puppet_authorization" -mod "choria-mcollective_choria" +mod "choria-choria" mod "saz-limits" mod "puppetlabs-inifile", "1.6.0" -mod "choria-nats" diff --git a/ec2environment/variables.tf b/ec2environment/variables.tf index 21a2e0c..ce59ee2 100644 --- a/ec2environment/variables.tf +++ b/ec2environment/variables.tf @@ -45,6 +45,6 @@ variable "emulator_subnet_cidr" { variable "amis" { description = "Base AMI to launch the instances with" default = { - eu-central-1 = "ami-fa2df395" + eu-central-1 = "ami-337be65c" } }