From 47712cd3de2be63c8cca09663ab2d55877609742 Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Thu, 2 Dec 2021 10:16:35 +0000 Subject: [PATCH] Update bundles/overlays and model default * Update constraints to make sure that units go to the right machine * Fix source for mysql-router apps * http for install_source for telegraf * Update some snap lxd stuff to ensure that works * Some bionic changes --- config/bundle_focal.yaml | 52 ++++++++++++------------ config/juju-model-default-cis-focal.yaml | 6 ++- config/overlays/ldap.yaml | 5 ++- 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/config/bundle_focal.yaml b/config/bundle_focal.yaml index 71a8167..55a4f93 100644 --- a/config/bundle_focal.yaml +++ b/config/bundle_focal.yaml @@ -133,32 +133,35 @@ machines: # Baremetals # Control Nodes "100": - constraints: tags=control + constraints: tags=control,asrock01 "101": - constraints: tags=control + constraints: tags=control,asrock02 "102": - constraints: tags=control + constraints: tags=control,asrock03 # LMA Nodes "200": - constraints: tags=compute + constraints: tags=compute,asrock01 "201": - constraints: tags=compute + constraints: tags=compute,asrock02 "202": - constraints: tags=compute + constraints: tags=compute,asrock03 # Landscape Nodes "300": - constraints: tags=compute + constraints: tags=compute,asrock01 + series: bionic "301": - constraints: tags=compute + constraints: tags=compute,asrock02 + series: bionic "302": - constraints: tags=compute + constraints: tags=compute,asrock03 + series: bionic # Contrail Nodes "400": - constraints: tags=control + constraints: tags=control,asrock01 "401": - constraints: tags=control + constraints: tags=control,asrock02 "402": - constraints: tags=control + constraints: tags=control,asrock03 # "500": # constraints: tags=compute # "501": @@ -514,7 +517,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin keystone-mysql-router: charm: cs:mysql-router bindings: @@ -522,7 +525,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin cinder-mysql-router: charm: cs:mysql-router bindings: @@ -530,7 +533,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin glance-mysql-router: charm: cs:mysql-router bindings: @@ -538,7 +541,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin gnocchi-mysql-router: charm: cs:mysql-router bindings: @@ -546,7 +549,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin heat-mysql-router: charm: cs:mysql-router bindings: @@ -554,7 +557,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin nova-cloud-controller-mysql-router: charm: cs:mysql-router bindings: @@ -562,7 +565,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin neutron-api-mysql-router: charm: cs:mysql-router bindings: @@ -570,7 +573,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin openstack-dashboard-mysql-router: charm: cs:mysql-router bindings: @@ -578,7 +581,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin placement-mysql-router: charm: cs:mysql-router bindings: @@ -586,7 +589,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin vault-mysql-router: charm: cs:mysql-router bindings: @@ -594,7 +597,7 @@ applications: shared-db: *internal-space db-router: *internal-space options: - openstack-origin: *openstack-origin + source: *openstack-origin neutron-api: charm: cs:neutron-api @@ -876,7 +879,6 @@ applications: - lxd:302 graylog: charm: cs:graylog - series: bionic bindings: "": *oam-space num_units: 1 @@ -971,7 +973,7 @@ applications: =92oX -----END PGP PUBLIC KEY BLOCK----- install_sources: | - - 'deb https://192.168.1.12/artifacts.elastic.co/packages/5.x/apt stable main' + - 'deb http://192.168.1.12/artifacts.elastic.co/packages/5.x/apt stable main' nagios: charm: cs:nagios series: bionic diff --git a/config/juju-model-default-cis-focal.yaml b/config/juju-model-default-cis-focal.yaml index 49f43a1..887a494 100644 --- a/config/juju-model-default-cis-focal.yaml +++ b/config/juju-model-default-cis-focal.yaml @@ -49,7 +49,7 @@ cloudinit-userdata: | remote_log_server= # SSH access limitation parameters at /etc/ssh/sshd_config (CIS rule 5.2.14) - AllowUsers=ubuntu + AllowUsers=ubuntu nova AllowGroups= DenyUsers= DenyGroups= @@ -92,6 +92,10 @@ cloudinit-userdata: | - "! systemd-detect-virt --container && mv /root/99-post-juju.yaml /etc/netplan/99-post-juju.yaml" - "! systemd-detect-virt --container && sudo lxc profile set default security.nesting true" - sudo netplan apply + snap: + commands: + "00": systemctl restart snapd default-series: "focal" apt-mirror: http://192.168.1.12/archive.ubuntu.com/ubuntu +lxd-snap-channel: 4.19/stable diff --git a/config/overlays/ldap.yaml b/config/overlays/ldap.yaml index 8b4da0e..6bb018a 100644 --- a/config/overlays/ldap.yaml +++ b/config/overlays/ldap.yaml @@ -3,14 +3,16 @@ applications: ldap-domain1: charm: cs:~openstack-charmers/ldap-test-fixture + num_units: 1 + series: bionic bindings: "": oam - num_units: 1 to: - lxd:100 ldap-domain2: charm: cs:~openstack-charmers/ldap-test-fixture num_units: 1 + series: bionic bindings: "": oam to: @@ -18,6 +20,7 @@ applications: ldap-domain3: charm: cs:~openstack-charmers/ldap-test-fixture num_units: 1 + series: bionic bindings: "": oam to: