launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #30737
[Merge] lp:~ines-almeida/canonical-mojo-specs/remove-old-ppa-units into lp:canonical-mojo-specs
You have been requested to review the proposed merge of lp:~ines-almeida/canonical-mojo-specs/remove-old-ppa-units into lp:canonical-mojo-specs.
For more details, see:
https://code.launchpad.net/~ines-almeida/canonical-mojo-specs/remove-old-ppa-units/+merge/455961
--
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~ines-almeida/canonical-mojo-specs/remove-old-ppa-units into lp:canonical-mojo-specs.
=== modified file 'launchpad-manual-servers/bundle.yaml'
--- launchpad-manual-servers/bundle.yaml 2023-11-15 13:57:57 +0000
+++ launchpad-manual-servers/bundle.yaml 2023-11-21 10:59:29 +0000
@@ -44,64 +44,6 @@
environment_name: prod-launchpad-manual-servers
sources: '{"etc": {"comment": "launchpad rabbitmq /etc", "frequency": "daily", "path": "/etc", "large_rotating_files": false}}'
{%- endif %}
- # launchpad-ppa
- launchpad-ppa:
- # No machine constraints set here - this is using a manual machine set up using SR-IOV.
- series: xenial
- charm: cs:ubuntu-19
- num_units: 1
- nrpe-launchpad-ppa:
- charm: cs:nrpe
- expose: true
- options:
- export_nagios_definitions: True
- hostgroups: {{ nagios_hostgroup }}
- nagios_host_context: {{ nagios_context }}
- nagios_hostname_type: host
- nagios_master: nagios.ps5.internal
- swap: ''
- swap_activity: ''
- telegraf-launchpad-ppa:
- charm: cs:~llama-charmers-next/telegraf
- expose: true
- options:
- extra_plugins: include-file://{{local_dir}}/telegraf_extra_plugins.yaml
- prometheus_ip_range: 91.189.94.59/32, 91.189.94.60/32, 185.125.190.67/32, 185.125.190.68/32, 127.0.0.0/8, 2001:67c:1561:8008::13/128, 2001:67c:1561:8008::14/128, 2620:2d:4000:1::67/128, 2620:2d:4000:1::68/128, ::1/128
-{%- if stage_name == "production" %}
- container-log-archive-launchpad-ppa:
- charm: cs:~container-log-archive-charmers/container-log-archive
- options:
- archive_after_default: '1'
- container_credentials: include-base64://{{ local_dir }}/novarc-log-archive
- container_name: launchpad-ps5-ppa
- container_type: "swift"
- delete_after_archive: True
- logdirs: "/var/log/apache2"
- nagios_host_context: {{ nagios_context }}
- nagios_hostname_type: "host"
- nagios_servicegroup: {{ nagios_servicegroups }}
- username: "root"
- turku-agent-launchpad-ppa:
- charm: cs:~turku-charmers/turku-agent
- options:
- api_auth: include-file://{{local_dir}}/turku.key
- api_url: https://turku.ps5.canonical.com/v1
- environment_name: prod-launchpad-manual-servers
- sources: >
- {
- "etc": {"comment": "launchpad ppa /etc", "frequency": "daily", "path": "/etc", "large_rotating_files": false},
- "lp_home": {"comment": "launchpad ppa lp_* homedirs", "frequency": "weekly", "path": "/home/", "large_rotating_files": false, "filter": ["+ lp_**", "- *"]},
- "root": {"comment": "launchpad ppa /root", "frequency": "weekly", "path": "/root", "large_rotating_files": false}
- }
- userdir-ldap-ppa:
- charm: cs:userdir-ldap
- expose: true
- options:
- apt-repo-keys: 'FD9070E51DF0D4FBDF6FB5C8C018BA5B562AD4EF'
- apt-repo-spec: 'deb http://ppa.launchpad.net/canonical-sysadmins/ud-ldap/ubuntu xenial main'
- template-hostname: 'ppa.lp.internal'
- sudoer-group: ''
-{%- endif %}
# launchpad-bazaar-codebrowse
launchpad-bazaar-codebrowse:
series: xenial
@@ -255,8 +197,6 @@
- ["launchpad-copy-archive-publisher", "telegraf-launchpad-copy-archive-publisher"]
- ["launchpad-mailman", "nrpe-launchpad-mailman"]
- ["launchpad-mailman", "telegraf-launchpad-mailman"]
- - ["launchpad-ppa", "nrpe-launchpad-ppa"]
- - ["launchpad-ppa", "telegraf-launchpad-ppa"]
- ["launchpad-rabbitmq", "nrpe-launchpad-rabbitmq"]
- ["launchpad-rabbitmq", "telegraf-launchpad-rabbitmq"]
{%- if stage_name == "production" %}
@@ -266,9 +206,5 @@
- ["launchpad-copy-archive-publisher", "turku-agent-launchpad-copy-archive-publisher"]
- ["launchpad-mailman", "turku-agent-launchpad-mailman"]
- ["launchpad-mailman", "userdir-ldap-mailman"]
- - ["launchpad-ppa", "container-log-archive-launchpad-ppa"]
- - ["launchpad-ppa", "turku-agent-launchpad-ppa"]
- - ["launchpad-ppa", "userdir-ldap-ppa"]
- ["launchpad-rabbitmq", "turku-agent-launchpad-rabbitmq"]
- - ["nrpe-launchpad-ppa", "container-log-archive-launchpad-ppa:nrpe-external-master"]
{%- endif %}
=== modified file 'launchpad-manual-servers/configs/custom-secgroups-production.yaml'
--- launchpad-manual-servers/configs/custom-secgroups-production.yaml 2023-11-17 14:25:50 +0000
+++ launchpad-manual-servers/configs/custom-secgroups-production.yaml 2023-11-21 10:59:29 +0000
@@ -31,18 +31,6 @@
- https
- smtp
- smtp_chroot
- launchpad-ppa:
- type: neutron
- rules:
- - ftp
- - http
- - https
- - rsync_logs
- - rsync_ppa_backup
- - ssh_alt_lp
- - ssh_alt_generic
- - ssh_public
- - tcp_highports
launchpad-rabbitmq:
type: neutron
rules: [amqp]
@@ -94,9 +82,6 @@
rsync_logs:
# Allow carob to rsync daemon port
- {"direction": "ingress", "protocol": "tcp", "family": "IPv4", "port": 873, "cidr": "91.189.90.14/32"}
- rsync_ppa_backup:
- # Allow wildcherry to rsync daemon port
- - {"direction": "ingress", "protocol": "tcp", "family": "IPv4", "port": 873, "cidr": "91.189.90.38/32"}
amqp:
# PS5 net_prod-lp-code-import
- {"direction": "ingress", "protocol": "tcp", "family": "IPv4", "port": 5672, cidr: "10.131.241.0/24"}
@@ -118,8 +103,6 @@
- {"direction": "ingress", "protocol": "tcp", "family": "IPv4", "port": 5672, cidr: "10.131.66.76/32"}
# PS5 bazaar-codehosting
- {"direction": "ingress", "protocol": "tcp", "family": "IPv4", "port": 5672, cidr: "10.131.66.217/32"}
- # ppa.lp.internal
- - {"direction": "ingress", "protocol": "tcp", "family": "IPv4", "port": 5672, cidr: "10.131.66.211/32"}
# neem.canonical.com
- {"direction": "ingress", "protocol": "tcp", "family": "IPv4", "port": 5672, cidr: "91.189.90.176/32"}
# prod-oops@launchpad-bastion-ps5
