From 6db70c53a098f962e755d1495800280be327e2f3 Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Fri, 17 Dec 2021 16:07:04 +0000 Subject: [PATCH] More updates * Update graylog to 50 and elasticsearch to 52 * Pin the ldap-domain charms * Ensure default series, when model creation * Update metadata urls, and default lxd channel * Ensure lxd channel is correct * Update/fix filebeat, elasticsearch version repos --- config/bundle_bionic.yaml | 6 ++++-- config/bundle_focal.yaml | 20 ++++++++++--------- config/juju-model-default-cis.yaml | 7 +++++++ config/juju-model-default.yaml | 6 +++++- config/juju_deploy_bionic.sh | 4 +++- .../openstack_versioned_overlay_bionic.yaml | 10 ++++++++-- .../openstack_versioned_overlay_focal.yaml | 4 ++-- 7 files changed, 40 insertions(+), 17 deletions(-) diff --git a/config/bundle_bionic.yaml b/config/bundle_bionic.yaml index 0f18531..c53f58d 100644 --- a/config/bundle_bionic.yaml +++ b/config/bundle_bionic.yaml @@ -761,6 +761,7 @@ applications: "": *oam-space num_units: 1 options: + channel: "3/stable" jvm_heap_size: '1G' rest_transport_uri: http://graylog.example.com:9001 index_rotation_period: PT3H @@ -813,6 +814,7 @@ applications: fllxIu9XYmiBERQ/qPDlGRlOgVTd9xUfHFkzB52c70E= =92oX -----END PGP PUBLIC KEY BLOCK----- + apt-repository: 'deb http://192.168.1.12/artifacts.elastic.co/packages/6.x/apt stable main' to: - 201 - 202 @@ -851,7 +853,7 @@ applications: =92oX -----END PGP PUBLIC KEY BLOCK----- install_sources: | - - 'deb http://192.168.1.12/artifacts.elastic.co/packages/5.x/apt stable main' + - 'deb http://192.168.1.12/artifacts.elastic.co/packages/6.x/apt stable main' nagios: charm: cs:nagios series: bionic @@ -1384,7 +1386,7 @@ relations: - [ "heat:juju-info", "filebeat:beats-host" ] - [ "heat:juju-info", "telegraf:juju-info" ] - - [ "heat:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + - [ "heat:juju-info", "nrpe-container:general-info" ] - [ "heat:juju-info", "landscape-client:container" ] - [ "mysql:juju-info", "filebeat:beats-host" ] diff --git a/config/bundle_focal.yaml b/config/bundle_focal.yaml index f970e82..07f8743 100644 --- a/config/bundle_focal.yaml +++ b/config/bundle_focal.yaml @@ -140,18 +140,18 @@ machines: "102": constraints: tags=control,asrock03 "103": - constraints: tags=control,asrock01 + constraints: tags=compute,asrock01 "104": - constraints: tags=control,asrock02 + constraints: tags=compute,asrock02 "105": - constraints: tags=control,asrock03 + constraints: tags=compute,asrock03 # LMA Nodes "200": - constraints: tags=compute,asrock01 + constraints: tags=control,asrock01 "201": - constraints: tags=compute,asrock02 + constraints: tags=control,asrock02 "202": - constraints: tags=compute,asrock03 + constraints: tags=control,asrock03 # Landscape Nodes "300": constraints: tags=compute,asrock01 @@ -884,6 +884,7 @@ applications: "": *oam-space num_units: 1 options: + channel: "3/stable" jvm_heap_size: '1G' rest_transport_uri: http://graylog.example.com:9001 index_rotation_period: PT3H @@ -936,6 +937,7 @@ applications: fllxIu9XYmiBERQ/qPDlGRlOgVTd9xUfHFkzB52c70E= =92oX -----END PGP PUBLIC KEY BLOCK----- + apt-repository: 'deb http://192.168.1.12/artifacts.elastic.co/packages/6.x/apt stable main' to: - 201 - 202 @@ -974,7 +976,7 @@ applications: =92oX -----END PGP PUBLIC KEY BLOCK----- install_sources: | - - 'deb http://192.168.1.12/artifacts.elastic.co/packages/5.x/apt stable main' + - 'deb http://192.168.1.12/artifacts.elastic.co/packages/6.x/apt stable main' nagios: charm: cs:nagios series: bionic @@ -985,7 +987,7 @@ applications: enable_livestatus: true check_timeout: 50 to: - - lxd:200 + - lxd:202 openstack-service-checks: charm: cs:~llama-charmers-next/openstack-service-checks constraints: *oam-space-constr @@ -994,7 +996,7 @@ applications: identity-credentials: *internal-space num_units: 1 to: - - lxd:200 + - lxd:202 nrpe-host: charm: cs:nrpe bindings: diff --git a/config/juju-model-default-cis.yaml b/config/juju-model-default-cis.yaml index ff3473c..0c30bb9 100644 --- a/config/juju-model-default-cis.yaml +++ b/config/juju-model-default-cis.yaml @@ -142,6 +142,7 @@ cloudinit-userdata: | # remove auditd as added by Hardening script but is not supported on containers - "systemd-detect-virt --container && apt purge -y auditd" - "systemd-detect-virt --container && rm -rf /root/99-post-juju.yaml" + - "systemd-detect-virt --container && sudo snap remove --purge lxd" - "! 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 @@ -151,3 +152,9 @@ cloudinit-userdata: | apt-mirror: http://192.168.1.12/archive.ubuntu.com/ubuntu lxd-snap-channel: "4.19/stable" + +container-image-metadata-url: http://192.168.1.12/lxd/ +container-image-stream: released + +agent-metadata-url: https://192.168.1.12/juju/tools/ +agent-stream: released diff --git a/config/juju-model-default.yaml b/config/juju-model-default.yaml index f68ade9..c96833e 100644 --- a/config/juju-model-default.yaml +++ b/config/juju-model-default.yaml @@ -28,6 +28,7 @@ cloudinit-userdata: | preruncmd: - locale-gen en_GB.UTF-8; update-locale - "systemd-detect-virt --container && rm -rf /root/99-post-juju.yaml" + - "systemd-detect-virt --container && sudo snap remove --purge lxd" - "! 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 @@ -38,5 +39,8 @@ cloudinit-userdata: | apt-mirror: http://192.168.1.12/archive.ubuntu.com/ubuntu lxd-snap-channel: "4.19/stable" -container-image-metadata-url: "http://192.168.1.12/lxd/" +container-image-metadata-url: http://192.168.1.12/lxd/ container-image-stream: released + +agent-metadata-url: https://192.168.1.12/juju/tools/ +agent-stream: released diff --git a/config/juju_deploy_bionic.sh b/config/juju_deploy_bionic.sh index d280dec..a734ac1 100755 --- a/config/juju_deploy_bionic.sh +++ b/config/juju_deploy_bionic.sh @@ -2,7 +2,9 @@ series=bionic -juju model-config juju-model-default-cis-${series}.yaml +juju model-config juju-model-default.yaml + +juju model-config default-series=${series} juju deploy ./bundle_${series}.yaml \ --overlay ./overlays/ovs.yaml \ diff --git a/config/overlays/openstack_versioned_overlay_bionic.yaml b/config/overlays/openstack_versioned_overlay_bionic.yaml index bb03fdc..b18c5f5 100644 --- a/config/overlays/openstack_versioned_overlay_bionic.yaml +++ b/config/overlays/openstack_versioned_overlay_bionic.yaml @@ -26,7 +26,7 @@ applications: easyrsa: charm: cs:~containers/easyrsa-296 elasticsearch: - charm: cs:elasticsearch-39 + charm: cs:elasticsearch-52 etcd: charm: cs:etcd-488 # external-policy-routing: @@ -40,7 +40,7 @@ applications: grafana: charm: cs:~prometheus-charmers/grafana-38 graylog: - charm: cs:graylog-49 + charm: cs:graylog-50 graylog-mongodb: charm: cs:mongodb-53 hacluster-aodh: @@ -91,6 +91,12 @@ applications: charm: cs:rabbitmq-server-97 landscape-server: charm: cs:landscape-server-38 + ldap-domain1: + charm: cs:~openstack-charmers/ldap-test-fixture-4 + ldap-domain2: + charm: cs:~openstack-charmers/ldap-test-fixture-4 + ldap-domain3: + charm: cs:~openstack-charmers/ldap-test-fixture-4 # lldpd: # charm: cs:lldpd-0 memcached: diff --git a/config/overlays/openstack_versioned_overlay_focal.yaml b/config/overlays/openstack_versioned_overlay_focal.yaml index 7f62176..807af03 100644 --- a/config/overlays/openstack_versioned_overlay_focal.yaml +++ b/config/overlays/openstack_versioned_overlay_focal.yaml @@ -28,7 +28,7 @@ applications: easyrsa: charm: cs:~containers/easyrsa-408 elasticsearch: - charm: cs:elasticsearch-49 + charm: cs:elasticsearch-52 etcd: charm: cs:etcd-583 # external-advanced-routing: @@ -42,7 +42,7 @@ applications: grafana: charm: cs:grafana-49 graylog: - charm: cs:graylog-47 + charm: cs:graylog-50 graylog-mongodb: charm: cs:mongodb-59 hacluster-aodh: