Skip to content

Update pe version on vagrant and puppet_install.sh support #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2021
Merged

Update pe version on vagrant and puppet_install.sh support #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Puppetfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ mod 'puppetlabs/catalog_preview', :latest
mod 'jdowning/rbenv', :latest
mod 'trlinkin/noop', :latest
mod 'puppet/archive', :latest

# Optionally used by psick::openvpn
# mod 'puppet/openvpn', :latest

# Optionally used by psick::aws
# mod 'puppetlabs/aws', :latest

# Requirements for cd4pe
Expand Down
1 change: 1 addition & 0 deletions bin/puppet_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ setup_apt() {
16.04) codename=xenial ;;
18.04) codename=bionic ;;
19.04) codename=bionic ;;
19.10) codename=bionic ;;
20.04) codename=focal ;;
20.10) codename=focal ;;
*) echo "Release not supported" ;;
Expand Down
1 change: 1 addition & 0 deletions keys
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etc/puppetlabs/puppet/keys
4 changes: 2 additions & 2 deletions vagrant/environments/demo/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ puppet:
controlrepo: https://github.com/example42/psick.git # URL of the controlrepo to deploy via r10k on Puppet Server

# Puppet Enterprise settings
pe_version: '2019.5.0' # Version of PE to install on the puppet server. See Note 2
pe_download_root: 'https://s3.amazonaws.com/pe-builds/released/2019.5.0' # Download base url. See Note 2
pe_version: '2021.1.0' # Version of PE to install on the puppet server. See Note 2
pe_download_root: 'https://s3.amazonaws.com/pe-builds/released/2021.1.0' # Download base url. See Note 2
pe_verbose: true # If to show PE installation output
pe_relocate_manifests: false # If to relocate manifests and module dir. Not needed in this setup.

Expand Down
16 changes: 11 additions & 5 deletions vagrant/environments/lab/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ puppet:
master_vm: puppet.lab.psick.io # Name of the VM which play as Puppet server for the others
master_fqdn: 'puppet.lab.psick.io' # FQDN of the Puppet server to use with puppet agent
master_ip: '10.42.43.101' # IP of the Puppet server to use with puppet agent
link_controlrepo: false # Add a link for a Puppet environment to the development control-repo
link_controlrepo: true # Add a link for a Puppet environment to the development control-repo
environment: host # Puppet environment to link to local control-repo

# Puppet Enterprise settings
pe_version: '2019.5.0' # Version of PE to install on the puppet server. See Note 2
pe_download_root: 'https://s3.amazonaws.com/pe-builds/released/2019.5.0' # Download base url. See Note 2
pe_version: '2021.1.0' # Version of PE to install on the puppet server. See Note 2
pe_download_root: 'https://s3.amazonaws.com/pe-builds/released/2021.1.0' # Download base url. See Note 2
pe_verbose: true # If to show PE installation output
pe_relocate_manifests: false # If to relocate manifests and module dir. Not needed in this setup.

Expand Down Expand Up @@ -81,8 +81,9 @@ nodes:
- puppetre
- role: puppetcd
ip_address: 10.42.43.110
memory: 4096
cpu: 2
memory: 16384
cpu: 8
box: centos8
forwarded_port:
guest: 8080
host: 1488
Expand All @@ -99,6 +100,11 @@ nodes:
forwarded_port2:
guest: 8443
host: 1690
- role: comply
ip_address: 10.42.43.108
memory: 16384
cpu: 12
box: centos8
- role: git
cpu: 2
memory: 3072
Expand Down
4 changes: 2 additions & 2 deletions vagrant/environments/ostest/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ puppet:
environment: host # Puppet environment to link to local control-repo

# Puppet Enterprise settings
# pe_version: '2016.5.1' # Version of PE to install on the puppet server. See Note 2
# pe_download_root: 'https://s3.amazonaws.com/pe-builds/released/2016.5.1' # Download base url. See Note 2
# pe_version: '2021.1.0' # Version of PE to install on the puppet server. See Note 2
# pe_download_root: 'https://s3.amazonaws.com/pe-builds/released/2021.1.0' # Download base url. See Note 2
# pe_verbose: true # If to show PE installation output
# pe_relocate_manifests: false # If to relocate manifests and module dir. Not needed in this setup.

Expand Down
4 changes: 2 additions & 2 deletions vagrant/environments/pe/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ puppet:
environment: production # Puppet environment to link to local control-repo

# Puppet Enterprise settings
pe_version: '2019.8.4' # Version of PE to install on the puppet server. See Note 2
pe_download_root: 'https://s3.amazonaws.com/pe-builds/released/2019.8.4' # Download base url. See Note 2
pe_version: '2021.1.0' # Version of PE to install on the puppet server. See Note 2
pe_download_root: 'https://s3.amazonaws.com/pe-builds/released/2021.1.0' # Download base url. See Note 2
pe_verbose: true # If to show PE installation output
pe_relocate_manifests: false # If to relocate manifests and module dir. Not needed in this setup.

Expand Down