Skip to content

Commit 5e139ba

Browse files
logicmindslogicminds
committed
Remove inotify and log watching service from docker examples
 * Previously we could spit out logs of what bolt was doing. This feature is now natively supported in bolt and there is no need for installing inotify and supporting services. * Additionally, this adds the old pe installer gpg key * Reformats json and yaml files under spec/docker
1 parent 53c8968 commit 5e139ba

23 files changed

+151
-82
lines changed

‎spec/docker/.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*.tar.gz
2+
puppet-enterprise*

‎spec/docker/Dockerfile

+9-10
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
FROM centos:7
66
EXPOSE 22
77
ENV LC_ALL="en_US.UTF-8" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8"
8-
RUN echo "LANG=en_US.UTF-8" > /etc/locale.conf
8+
RUN echo "LANG=en_US.UTF-8" > /etc/locale.conf
99
STOPSIGNAL SIGRTMIN+3
10-
ADD live_audit.sh /usr/bin/live_audit.sh
11-
ADD live_audit.service /etc/systemd/system/live_audit.service
12-
RUN chmod 644 /etc/systemd/system/live_audit.service && chmod 755 /usr/bin/live_audit.sh && \
13-
echo "root:test" | chpasswd; \
14-
useradd -m -s /bin/bash centos && echo "centos:test" | chpasswd;
15-
RUN yum -y install epel-release systemd rsync tree vim openssh openssh-server openssh-clients anacron sudo curl openssl
16-
RUN yum -y install inotify-tools && mkdir /root/bolt_scripts && yum clean all
10+
RUN echo "root:test" | chpasswd && \
11+
useradd -m -s /bin/bash centos && echo "centos:test" | chpasswd;
12+
RUN yum -y install wget systemd rsync tree vim openssh openssh-server openssh-clients anacron sudo curl openssl
13+
RUN yum remove -y puppet-agent # remove any old puppet-agent
14+
COPY pe-old-pub.gpg /tmp
15+
RUN mkdir /root/bolt_scripts && yum clean all && \
16+
gpg --import /tmp/pe-old-pub.gpg
1717
# remove any scripts that don't need to be run
1818
RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
1919
rm -f /lib/systemd/system/multi-user.target.wants/*; \
@@ -24,8 +24,7 @@ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == system
2424
rm -f /lib/systemd/system/basic.target.wants/*; \
2525
rm -f /lib/systemd/system/anaconda.target.wants/*; \
2626
rm -rf /var/cache/yum; \
27-
ln -s '/usr/lib/systemd/system/sshd.service' '/etc/systemd/system/multi-user.target.wants/sshd.service' && \
28-
ln -s '/etc/systemd/system/live_audit.service' '/etc/systemd/system/multi-user.target.wants/live_audit.service'
27+
ln -s '/usr/lib/systemd/system/sshd.service' '/etc/systemd/system/multi-user.target.wants/sshd.service'
2928
ARG HOST="localhost"
3029
RUN mkdir -p /root/.puppetlabs/client-tools && \
3130
echo $' \n\

‎spec/docker/extra-large-ha/docker-compose.yaml

+9-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ services:
6666
- /run
6767
- /tmp
6868
volumes:
69-
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
69+
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
70+
71+
7072
pe_xl_core_1:
7173
restart: always
7274
depends_on:
@@ -96,7 +98,9 @@ services:
9698
- /run
9799
- /tmp
98100
volumes:
99-
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
101+
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
102+
103+
100104
pe_xl_core_0:
101105
restart: always
102106
build:
@@ -124,4 +128,6 @@ services:
124128
- /run
125129
- /tmp
126130
volumes:
127-
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
131+
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
132+
133+

‎spec/docker/extra-large-ha/params.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
"primary_postgresql_host": "pe-xl-db-0.puppet.vm",
44
"replica_postgresql_host": "pe-xl-db-1.puppet.vm",
55
"replica_host": "pe-xl-core-1.puppet.vm",
6-
"compiler_hosts": ["pe-xl-compiler-0.puppet.vm"],
6+
"compiler_hosts": [
7+
"pe-xl-compiler-0.puppet.vm"
8+
],
79
"console_password": "puppetlabs",
8-
"dns_alt_names": [ "puppet", "pe-xl-core-0.puppet.vm", "puppet-xl.vm" ],
10+
"dns_alt_names": [
11+
"puppet",
12+
"pe-xl-core-0.puppet.vm",
13+
"puppet-xl.vm"
14+
],
915
"version": "2019.8.5",
1016
"compiler_pool_address": "puppet-xl.vm"
1117
}

‎spec/docker/extra-large-ha/upgrade_params.json

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
2-
"primary_host": "pe-xl-core-0.puppet.vm",
3-
"primary_postgresql_host": "pe-xl-db-0.puppet.vm",
4-
"replica_postgresql_host": "pe-xl-db-1.puppet.vm",
5-
"replica_host": "pe-xl-core-1.puppet.vm",
6-
"compiler_hosts": ["pe-xl-compiler-0.puppet.vm"],
7-
"version": "2019.8.5"
2+
"primary_host": "pe-xl-core-0.puppet.vm",
3+
"primary_postgresql_host": "pe-xl-db-0.puppet.vm",
4+
"replica_postgresql_host": "pe-xl-db-1.puppet.vm",
5+
"replica_host": "pe-xl-core-1.puppet.vm",
6+
"compiler_hosts": [
7+
"pe-xl-compiler-0.puppet.vm"
8+
],
9+
"version": "2019.8.5"
810
}

‎spec/docker/extra-large/docker-compose.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,6 @@ services:
6969
- /run
7070
- /tmp
7171
volumes:
72-
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
72+
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
73+
74+

‎spec/docker/extra-large/params.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
{
22
"primary_host": "pe-xl-core-0.puppet.vm",
33
"primary_postgresql_host": "pe-xl-db-0.puppet.vm",
4-
"compiler_hosts": ["pe-xl-compiler-0.puppet.vm"],
4+
"compiler_hosts": [
5+
"pe-xl-compiler-0.puppet.vm"
6+
],
57
"console_password": "puppetlabs",
6-
"dns_alt_names": [ "puppet", "pe-xl-core-0.puppet.vm" ],
8+
"dns_alt_names": [
9+
"puppet",
10+
"pe-xl-core-0.puppet.vm"
11+
],
712
"version": "2019.8.5"
813
}

‎spec/docker/extra-large/upgrade_params.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"primary_host": "pe-xl-core-0.puppet.vm",
33
"primary_postgresql_host": "pe-xl-db-0.puppet.vm",
44
"compiler_hosts": ["pe-xl-compiler-0.puppet.vm"],
5-
"version": "2019.8.5"
5+
"version": "2019.8.5"
66
}

‎spec/docker/large-ha/docker-compose.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ services:
5050
- /run
5151
- /tmp
5252
volumes:
53-
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
53+
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
54+
5455
large_aio:
5556
build:
5657
dockerfile: 'Dockerfile'
@@ -78,3 +79,5 @@ services:
7879
- /tmp
7980
volumes:
8081
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
82+
83+

‎spec/docker/large-ha/params.json

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
{
22
"primary_host": "pe-lg.puppet.vm",
33
"replica_host": "pe-lg-replica.puppet.vm",
4-
"compiler_hosts": ["pe-lg-compiler-0.puppet.vm"],
4+
"compiler_hosts": [
5+
"pe-lg-compiler-0.puppet.vm"
6+
],
57
"console_password": "puppetlabs",
6-
"dns_alt_names": [ "puppet", "pe-lg.puppet.vm" ],
8+
"dns_alt_names": [
9+
"puppet",
10+
"pe-lg.puppet.vm"
11+
],
712
"version": "2019.8.5"
813
}

‎spec/docker/large-ha/upgrade_params.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2-
"primary_host": "pe-lg.puppet.vm",
3-
"replica_host": "pe-lg-replica.puppet.vm",
4-
"compiler_hosts": ["pe-lg-compiler-0.puppet.vm"],
5-
"version": "2019.8.5"
2+
"primary_host": "pe-lg.puppet.vm",
3+
"replica_host": "pe-lg-replica.puppet.vm",
4+
"compiler_hosts": [
5+
"pe-lg-compiler-0.puppet.vm"
6+
],
7+
"version": "2019.8.5"
68
}
7-

‎spec/docker/large/docker-compose.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,5 @@ services:
4848
- /run
4949
- /tmp
5050
volumes:
51-
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
51+
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
52+

‎spec/docker/large/params.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
{
22
"primary_host": "pe-lg.puppet.vm",
3-
"compiler_hosts": ["pe-lg-compiler-0.puppet.vm"],
3+
"compiler_hosts": [
4+
"pe-lg-compiler-0.puppet.vm"
5+
],
46
"console_password": "puppetlabs",
5-
"dns_alt_names": [ "puppet", "pe-lg.puppet.vm" ],
6-
"version": "2019.8.5"
7+
"dns_alt_names": [
8+
"puppet",
9+
"pe-lg.puppet.vm"
10+
],
11+
"version": "2019.8.1"
712
}

‎spec/docker/large/upgrade_params.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"primary_host": "pe-lg.puppet.vm",
3-
"compiler_hosts": ["pe-lg-compiler-0.puppet.vm"],
4-
"version": "2019.8.5"
2+
"primary_host": "pe-lg.puppet.vm",
3+
"compiler_hosts": [
4+
"pe-lg-compiler-0.puppet.vm"
5+
],
6+
"version": "2019.8.8"
57
}
6-

‎spec/docker/live_audit.service

-8
This file was deleted.

‎spec/docker/live_audit.sh

-20
This file was deleted.

‎spec/docker/pe-old-pub.gpg

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
3+
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
50+
3xJn
51+
=mMjt
52+
-----END PGP PUBLIC KEY BLOCK-----

‎spec/docker/standard-ha/docker-compose.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ services:
2828
- /run
2929
- /tmp
3030
volumes:
31-
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
31+
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
32+
3233
standard_aio:
3334
build:
3435
dockerfile: 'Dockerfile'
@@ -55,4 +56,6 @@ services:
5556
- /run
5657
- /tmp
5758
volumes:
58-
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
59+
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
60+
61+

‎spec/docker/standard-ha/params.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
"primary_host": "pe-std.puppet.vm",
33
"replica_host": "pe-std-replica.puppet.vm",
44
"console_password": "puppetlabs",
5-
"dns_alt_names": [ "puppet", "pe-std.puppet.vm" ],
5+
"dns_alt_names": [
6+
"puppet",
7+
"pe-std.puppet.vm"
8+
],
69
"version": "2019.8.5"
710
}

‎spec/docker/standard-ha/upgrade_params.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
2-
"primary_host": "pe-std.puppet.vm",
3-
"replica_host": "pe-std-replica.puppet.vm",
4-
"version": "2019.8.5"
2+
"primary_host": "pe-std.puppet.vm",
3+
"replica_host": "pe-std-replica.puppet.vm",
4+
"version": "2019.8.5"
55
}
6-

‎spec/docker/standard/docker-compose.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ services:
3131
- /tmp
3232
volumes:
3333
- '/sys/fs/cgroup:/sys/fs/cgroup:ro'
34+
35+

‎spec/docker/standard/params.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"primary_host": "pe-std.puppet.vm",
33
"console_password": "puppetlabs",
4-
"dns_alt_names": [ "puppet", "pe-std.puppet.vm" ],
5-
"version": "2019.8.5",
6-
"r10k_remote": "https://gitlab.com/nwops/control-repo.git"
4+
"dns_alt_names": [
5+
"puppet",
6+
"pe-std.puppet.vm"
7+
],
8+
"version": "2019.8.8"
79
}

‎spec/docker/standard/upgrade_params.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"primary_host": "pe-std.puppet.vm",
3-
"version": "2019.8.5"
2+
"primary_host": "pe-std.puppet.vm",
3+
"version": "2019.8.8"
44
}
5-

0 commit comments

Comments
 (0)