From 965fd7c7a227fc66bf5ebe031e1bcaca0c5abf6c Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Fri, 9 Jun 2023 16:01:07 +0100 Subject: [PATCH] Current updates to the bundles * migrate charms to charm-hub, and template up * Add ceph-radosgw for swift stuff * Prep work on lma seperation to a new model * Remove some erronous relations * Add lma relations to memcached Signed-off-by: Arif Ali --- config/bundle_controller.yaml | 6 +- config/bundle_focal.yaml | 32 +- config/bundle_infra.yaml | 6 +- config/bundle_lma.yaml | 407 ++++++++++++++++++ config/juju_deploy_focal.sh | 2 +- config/juju_deploy_lma.sh | 9 + config/overlays/lma.yaml | 14 +- .../openstack_versioned_overlay_focal.yaml | 74 ++-- 8 files changed, 499 insertions(+), 51 deletions(-) create mode 100644 config/bundle_lma.yaml create mode 100755 config/juju_deploy_lma.sh diff --git a/config/bundle_controller.yaml b/config/bundle_controller.yaml index 916a1d5..53ec540 100644 --- a/config/bundle_controller.yaml +++ b/config/bundle_controller.yaml @@ -5,11 +5,11 @@ variables: oam-space: &oam-space oam saas: graylog: - url: admin/cpe-focal.graylog-beats + url: admin/lma.graylog-beats prometheus: - url: admin/cpe-focal.prometheus-target + url: admin/lma.prometheus-target nagios: - url: admin/cpe-focal.nagios-monitors + url: admin/lma.nagios-monitors machines: "0": {} "1": {} diff --git a/config/bundle_focal.yaml b/config/bundle_focal.yaml index 9cea5e9..a7e8ea6 100644 --- a/config/bundle_focal.yaml +++ b/config/bundle_focal.yaml @@ -98,6 +98,7 @@ variables: contrail-vip: &contrail-api-vip "10.0.1.221" vault-vip: &vault-vip "10.0.1.222" placement-vip: &placement-vip "10.0.1.223" + radosgw-vip: &radosgw-vip "10.0.1.224" # NTP configuration ntp-source: &ntp-source "192.168.1.11" @@ -205,6 +206,8 @@ applications: charm: cs:hacluster hacluster-nova: charm: cs:hacluster + hacluster-radosgw: + charm: cs:hacluster hacluster-heat: charm: cs:hacluster hacluster-vault: @@ -216,21 +219,21 @@ applications: options: enable-iommu: false governor: "performance" - enable-pti: true + enable-pti: "on" update-grub: true # sysconfig-storage: # charm: cs:sysconfig # options: # enable-iommu: true # governor: "performance" -# enable-pti: true +# enable-pti: "on" # update-grub: true sysconfig-control: charm: cs:sysconfig options: enable-iommu: true governor: "performance" - enable-pti: true + enable-pti: "on" update-grub: true # bcache-tuning @@ -328,6 +331,25 @@ applications: # - '1003' # - '1004' # - '1005' + ceph-radosgw: + charm: cs:ceph-radosgw + num_units: 3 + constraints: *combi-access-constr + bindings: + "": *oam-space + public: *public-space + admin: *admin-space + internal: *internal-space + mon: *ceph-public-space + options: + source: *openstack-origin + vip: *radosgw-vip + region: *openstack-region + operator-roles: "Member,admin" # Contrail requires admin and not Admin + to: + - lxd:100 + - lxd:101 + - lxd:102 # OpenStack aodh: charm: cs:aodh @@ -965,6 +987,10 @@ relations: - [ "ceph-osd:mon", "ceph-mon:osd" ] # - [ "ceph-osd2:mon", "ceph-mon:osd" ] + - [ "ceph-radosgw:mon", "ceph-mon:radosgw" ] + - [ "ceph-radosgw:identity-service", "keystone:identity-service" ] + - [ "ceph-radosgw:ha", "hacluster-radosgw:ha" ] + - [ "glance:ha", "hacluster-glance:ha" ] - [ "glance:shared-db", "glance-mysql-router:shared-db" ] - [ "glance:identity-service", "keystone:identity-service" ] diff --git a/config/bundle_infra.yaml b/config/bundle_infra.yaml index a0c59b2..a5620b4 100644 --- a/config/bundle_infra.yaml +++ b/config/bundle_infra.yaml @@ -5,11 +5,11 @@ variables: oam-space: &oam-space oam saas: graylog: - url: admin/cpe-focal.graylog-beats + url: admin/lma.graylog-beats prometheus: - url: admin/cpe-focal.prometheus-target + url: admin/lma.prometheus-target nagios: - url: admin/cpe-focal.nagios-monitors + url: admin/lma.nagios-monitors machines: "0": {} "1": {} diff --git a/config/bundle_lma.yaml b/config/bundle_lma.yaml new file mode 100644 index 0000000..0efde93 --- /dev/null +++ b/config/bundle_lma.yaml @@ -0,0 +1,407 @@ +variables: + oam-space: &oam-space oam + public-space: &public-space oam + internal-space: &internal-space oam + nagios-context: &nagios-context arif-nc01 + oam-space-constr: &oam-space-constr spaces=oam + +applications: + graylog: + charm: cs:graylog + bindings: + "": *oam-space + num_units: 1 + options: + channel: "4/stable" + jvm_heap_size: '1G' + rest_transport_uri: http://graylog.example.com:9001 + index_rotation_period: PT3H + to: + - 200 + graylog-mongodb: + charm: cs:mongodb + bindings: + "": *oam-space + num_units: 1 + options: + nagios_context: *nagios-context + to: + - lxd:200 + elasticsearch: + charm: cs:elasticsearch + bindings: + "": *oam-space + num_units: 2 + options: + firewall_enabled: False + es-heap-size: 2 + gpg-key: | + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: SKS 1.1.6 + Comment: Hostname: keyserver.ubuntu.com + + mQENBFI3HsoBCADXDtbNJnxbPqB1vDNtCsqhe49vFYsZN9IOZsZXgp7aHjh6CJBDA+bGFOwy + hbd7at35jQjWAw1O3cfYsKAmFy+Ar3LHCMkV3oZspJACTIgCrwnkic/9CUliQe324qvObU2Q + RtP4Fl0zWcfb/S8UYzWXWIFuJqMvE9MaRY1bwUBvzoqavLGZj3SF1SPO+TB5QrHkrQHBsmX+ + Jda6d4Ylt8/t6CvMwgQNlrlzIO9WT+YN6zS+sqHd1YK/aY5qhoLNhp9G/HxhcSVCkLq8SStj + 1ZZ1S9juBPoXV1ZWNbxFNGwOh/NYGldD2kmBf3YgCqeLzHahsAEpvAm8TBa7Q9W21C8vABEB + AAG0RUVsYXN0aWNzZWFyY2ggKEVsYXN0aWNzZWFyY2ggU2lnbmluZyBLZXkpIDxkZXZfb3Bz + QGVsYXN0aWNzZWFyY2gub3JnPokBOAQTAQIAIgUCUjceygIbAwYLCQgHAwIGFQgCCQoLBBYC + AwECHgECF4AACgkQ0n1mbNiOQrRzjAgAlTUQ1mgo3nK6BGXbj4XAJvuZDG0HILiUt+pPnz75 + nsf0NWhqR4yGFlmpuctgCmTD+HzYtV9fp9qW/bwVuJCNtKXk3sdzYABY+Yl0Cez/7C2GuGCO + lbn0luCNT9BxJnh4mC9h/cKI3y5jvZ7wavwe41teqG14V+EoFSn3NPKmTxcDTFrV7SmVPxCB + cQze00cJhprKxkuZMPPVqpBS+JfDQtzUQD/LSFfhHj9eD+Xe8d7sw+XvxB2aN4gnTlRzjL1n + TRp0h2/IOGkqYfIG9rWmSLNlxhB2t+c0RsjdGM4/eRlPWylFbVMc5pmDpItrkWSnzBfkmXL3 + vO2X3WvwmSFiQbkBDQRSNx7KAQgA5JUlzcMW5/cuyZR8alSacKqhSbvoSqqbzHKcUQZmlzNM + KGTABFG1yRx9r+wa/fvqP6OTRzRDvVS/cycws8YX7Ddum7x8uI95b9ye1/Xy5noPEm8cD+hp + lnpU+PBQZJ5XJ2I+1l9Nixx47wPGXeClLqcdn0ayd+v+Rwf3/XUJrvccG2YZUiQ4jWZkoxsA + 07xx7Bj+Lt8/FKG7sHRFvePFU0ZS6JFx9GJqjSBbHRRkam+4emW3uWgVfZxuwcUCn1ayNgRt + KiFv9jQrg2TIWEvzYx9tywTCxc+FFMWAlbCzi+m4WD+QUWWfDQ009U/WM0ks0KwwEwSk/UDu + ToxGnKU2dQARAQABiQEfBBgBAgAJBQJSNx7KAhsMAAoJENJ9ZmzYjkK0c3MIAIE9hAR20mqJ + WLcsxLtrRs6uNF1VrpB+4n/55QU7oxA1iVBO6IFu4qgsF12JTavnJ5MLaETlggXY+zDef9sy + TPXoQctpzcaNVDmedwo1SiL03uMoblOvWpMR/Y0j6rm7IgrMWUDXDPvoPGjMl2q1iTeyHkMZ + EyUJ8SKsaHh4jV9wp9KmC8C+9CwMukL7vM5w8cgvJoAwsp3Fn59AxWthN3XJYcnMfStkIuWg + R7U2r+a210W6vnUxU4oN0PmMcursYPyeV0NX/KQeUeNMwGTFB6QHS/anRaGQewijkrYYoTNt + 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 + filebeat: + charm: cs:filebeat + options: + logpath: "/var/log/*.log /var/log/*/*.log /var/log/syslog" + install_keys: |- + - | + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: SKS 1.1.6 + Comment: Hostname: keyserver.ubuntu.com + mQENBFI3HsoBCADXDtbNJnxbPqB1vDNtCsqhe49vFYsZN9IOZsZXgp7aHjh6CJBDA+bGFOwy + hbd7at35jQjWAw1O3cfYsKAmFy+Ar3LHCMkV3oZspJACTIgCrwnkic/9CUliQe324qvObU2Q + RtP4Fl0zWcfb/S8UYzWXWIFuJqMvE9MaRY1bwUBvzoqavLGZj3SF1SPO+TB5QrHkrQHBsmX+ + Jda6d4Ylt8/t6CvMwgQNlrlzIO9WT+YN6zS+sqHd1YK/aY5qhoLNhp9G/HxhcSVCkLq8SStj + 1ZZ1S9juBPoXV1ZWNbxFNGwOh/NYGldD2kmBf3YgCqeLzHahsAEpvAm8TBa7Q9W21C8vABEB + AAG0RUVsYXN0aWNzZWFyY2ggKEVsYXN0aWNzZWFyY2ggU2lnbmluZyBLZXkpIDxkZXZfb3Bz + QGVsYXN0aWNzZWFyY2gub3JnPokBOAQTAQIAIgUCUjceygIbAwYLCQgHAwIGFQgCCQoLBBYC + AwECHgECF4AACgkQ0n1mbNiOQrRzjAgAlTUQ1mgo3nK6BGXbj4XAJvuZDG0HILiUt+pPnz75 + nsf0NWhqR4yGFlmpuctgCmTD+HzYtV9fp9qW/bwVuJCNtKXk3sdzYABY+Yl0Cez/7C2GuGCO + lbn0luCNT9BxJnh4mC9h/cKI3y5jvZ7wavwe41teqG14V+EoFSn3NPKmTxcDTFrV7SmVPxCB + cQze00cJhprKxkuZMPPVqpBS+JfDQtzUQD/LSFfhHj9eD+Xe8d7sw+XvxB2aN4gnTlRzjL1n + TRp0h2/IOGkqYfIG9rWmSLNlxhB2t+c0RsjdGM4/eRlPWylFbVMc5pmDpItrkWSnzBfkmXL3 + vO2X3WvwmSFiQbkBDQRSNx7KAQgA5JUlzcMW5/cuyZR8alSacKqhSbvoSqqbzHKcUQZmlzNM + KGTABFG1yRx9r+wa/fvqP6OTRzRDvVS/cycws8YX7Ddum7x8uI95b9ye1/Xy5noPEm8cD+hp + lnpU+PBQZJ5XJ2I+1l9Nixx47wPGXeClLqcdn0ayd+v+Rwf3/XUJrvccG2YZUiQ4jWZkoxsA + 07xx7Bj+Lt8/FKG7sHRFvePFU0ZS6JFx9GJqjSBbHRRkam+4emW3uWgVfZxuwcUCn1ayNgRt + KiFv9jQrg2TIWEvzYx9tywTCxc+FFMWAlbCzi+m4WD+QUWWfDQ009U/WM0ks0KwwEwSk/UDu + ToxGnKU2dQARAQABiQEfBBgBAgAJBQJSNx7KAhsMAAoJENJ9ZmzYjkK0c3MIAIE9hAR20mqJ + WLcsxLtrRs6uNF1VrpB+4n/55QU7oxA1iVBO6IFu4qgsF12JTavnJ5MLaETlggXY+zDef9sy + TPXoQctpzcaNVDmedwo1SiL03uMoblOvWpMR/Y0j6rm7IgrMWUDXDPvoPGjMl2q1iTeyHkMZ + EyUJ8SKsaHh4jV9wp9KmC8C+9CwMukL7vM5w8cgvJoAwsp3Fn59AxWthN3XJYcnMfStkIuWg + R7U2r+a210W6vnUxU4oN0PmMcursYPyeV0NX/KQeUeNMwGTFB6QHS/anRaGQewijkrYYoTNt + fllxIu9XYmiBERQ/qPDlGRlOgVTd9xUfHFkzB52c70E= + =92oX + -----END PGP PUBLIC KEY BLOCK----- + install_sources: | + - 'deb http://192.168.1.12/artifacts.elastic.co/packages/6.x/apt stable main' + nagios: + charm: cs:nagios + series: bionic + bindings: + "": *oam-space + num_units: 1 + options: + enable_livestatus: true + check_timeout: 50 + to: + - lxd:202 + openstack-service-checks: + charm: cs:~llama-charmers-next/openstack-service-checks + constraints: *oam-space-constr + bindings: + "": *public-space + identity-credentials: *internal-space + num_units: 1 + to: + - lxd:202 + nrpe-host: + charm: cs:nrpe + bindings: + monitors: *oam-space + options: + nagios_hostname_type: "host" + nagios_host_context: *nagios-context + xfs_errors: "30" + netlinks: | + - bond0 mtu:1500 speed:1000 + - bond1 mtu:9000 speed:50000 + - eno1 mtu:1500 speed:1000 + - eno2 mtu:1500 speed:1000 + - enp25s0f0 mtu:9000 speed:25000 + - enp25s0f1 mtu:9000 speed:25000 + nrpe-container: + charm: cs:nrpe + bindings: + monitors: *oam-space + options: + nagios_hostname_type: unit + nagios_host_context: *nagios-context + disk_root: '' + load: '' + swap: '' + swap_activity: '' + mem: '' + prometheus: + charm: cs:prometheus2 + bindings: + "": *oam-space + num_units: 1 + to: + - lxd:201 + prometheus-openstack-exporter: + charm: cs:prometheus-openstack-exporter + constraints: *oam-space-constr + bindings: + "": *public-space + identity-credentials: *internal-space + prometheus-openstack-exporter-service: *oam-space + num_units: 1 + to: + - lxd:201 + grafana: + charm: cs:~prometheus-charmers/grafana + bindings: + "": *oam-space + options: + port: "3000" + install_method: snap + num_units: 1 + to: + - lxd:201 + telegraf: + charm: cs:telegraf + options: + # Contrail services are listening on 8094 + socket_listener_port: '8095' + install_sources: | + - 'deb http://192.168.1.12/ppa.launchpad.net/telegraf-devs/ppa/ubuntu focal main' + install_keys: |- + - | + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: SKS 1.1.6 + Comment: Hostname: keyserver.ubuntu.com + mQINBFcVSuIBEAC80aj0tAQ6+NhGV/bkSwu6Oj+BpDR50Be3uBv7ttdtvChL5zHTnaxjdK3h + LKSyrDLlmSOkffQ2uO7CxvqeF09MsHhyvrDDx0EY54//xxoAB++PoB2OQqmqldg3Al5Hp4Dz + rllV5CIX5PD8NGX8UpO3HXk5wEwn9G81l8cia3vPveU82EIkHMiJGpk6+L86OMlwXzxkSI3M + xXgNFKQc+ELDYLvGSseYC9vPN3kdmFoo/UjznPPE4fxr4bXit3N8Abl1jYjBa0x6SWkK1BAb + s8w3BXtvyk90z9Oyme69wPD4zAYfFp+kN2nDmTDBMtNCyMu9oatdI5SukMNK4Lcm8eAE6VNs + 04j7BKvGk9+17M8WP9Pw8nIisOwScS9gUlJlLUpnBaJ+sxoOvGQ4mzZxYMKzJh0E58aEX3bS + AyzQfsae8bZLNOTcgotyzzIDJFF9npzu3wmKjeOt/706p4LiDqKUbQK6cI+QcJ/y80ZUK8pB + M043ttSHWLmTBFX2drp6zQGae9+02fX89ZD+5c+MPlubJMYCCKkvQT4OssHfC+dVDQ66rwUy + OObrzsVgikdpIxQVitL3J+Dms56xAkdFfoo+qdxxdv9S/eakc5mfavc/4WVvmFDaJiqJnJRR + Ryw1zApRtuweEEdVn8niy1mahoKpWaw1pTI4AazjWI6xJH1JyQARAQABtB9MYXVuY2hwYWQg + UFBBIGZvciBUZWxlZ3JhZiBEZXZziQI4BBMBAgAiBQJXFUriAhsDBgsJCAcDAgYVCAIJCgsE + FgIDAQIeAQIXgAAKCRDxDL4ByUQG9UgbEACa4IzdeYxH/S5I6MrZfvWNo/JTZ/MZWDD+QlMW + 60ThAemCUSE+NJvZZ1q7ovGFpYnHJT9GQXOwJAX1quDUqyM1uXNmLlOyIVNnmjUTINoLhw2V + iC8E7dMWC9w4Na2fKezmNHH00kNl43ncstIjjZ3pLnDGYm1y0ItiCUcTRgHhx2cUZ/vStz1S + Pdqj4P3i8vuspoYJ2T3VPlM/0G+u9Yjuy3Uzu9RugOyO3UJPoi3+4O2VTNosSBy5MILVCp49 + eigyFVGpq5sT/c86qd1zqmsNWEubrlzDfETS4LMj9epr46ZKPXGQkeryt1m2Oe0HkIdNZ+IQ + 5p+i9fnEy7/1uKTXWQYsg2UWsLA2PvTvwY8JxxMhUFgv12q2w7STntqJyi9PLItYNtbtKoS3 + XZCCMqQLCWMXHY+2ol6rRSfs06H/wzlR8LjDaEXkDVuDmqMtcbgTboZYblsGxst7I/Y4Wgfi + J52uiIyobQ69uJbG0XeRTLZ3WyrBkopEsTX/+sQjVqbADXYU4hBVDgnCf2uN/5dcwSEvDj8/ + +WsToAfEJkscRBsQjTLVzf+eFqHLrbqz/yoYIqBc//IJMBSbxIf5mrOHHLdbOuMCB6PVwpTI + vLFOSDNPuVDX+S1goA8KJTnXpm8jWDynn3XaXx3AlYw4iZ0ETSgQLQLRd6JuPOEGXsGdBA== + =ufaX + -----END PGP PUBLIC KEY BLOCK----- + extra_plugins: | + [[inputs.exec]] + commands = [ "/usr/bin/awk '{print int($1)}' /proc/uptime" ] + name_override = "exec_uptime" + data_format = "value" + bindings: + # overrides private-address exposed to prometheus + prometheus-client: *oam-space + telegraf-prometheus: + charm: cs:telegraf + bindings: + # overrides private-address exposed to prometheus + prometheus-client: *oam-space + options: + install_sources: | + - 'deb http://192.168.1.12/ppa.launchpad.net/telegraf-devs/ppa/ubuntu focal main' + install_keys: |- + - | + -----BEGIN PGP PUBLIC KEY BLOCK----- + Version: SKS 1.1.6 + Comment: Hostname: keyserver.ubuntu.com + mQINBFcVSuIBEAC80aj0tAQ6+NhGV/bkSwu6Oj+BpDR50Be3uBv7ttdtvChL5zHTnaxjdK3h + LKSyrDLlmSOkffQ2uO7CxvqeF09MsHhyvrDDx0EY54//xxoAB++PoB2OQqmqldg3Al5Hp4Dz + rllV5CIX5PD8NGX8UpO3HXk5wEwn9G81l8cia3vPveU82EIkHMiJGpk6+L86OMlwXzxkSI3M + xXgNFKQc+ELDYLvGSseYC9vPN3kdmFoo/UjznPPE4fxr4bXit3N8Abl1jYjBa0x6SWkK1BAb + s8w3BXtvyk90z9Oyme69wPD4zAYfFp+kN2nDmTDBMtNCyMu9oatdI5SukMNK4Lcm8eAE6VNs + 04j7BKvGk9+17M8WP9Pw8nIisOwScS9gUlJlLUpnBaJ+sxoOvGQ4mzZxYMKzJh0E58aEX3bS + AyzQfsae8bZLNOTcgotyzzIDJFF9npzu3wmKjeOt/706p4LiDqKUbQK6cI+QcJ/y80ZUK8pB + M043ttSHWLmTBFX2drp6zQGae9+02fX89ZD+5c+MPlubJMYCCKkvQT4OssHfC+dVDQ66rwUy + OObrzsVgikdpIxQVitL3J+Dms56xAkdFfoo+qdxxdv9S/eakc5mfavc/4WVvmFDaJiqJnJRR + Ryw1zApRtuweEEdVn8niy1mahoKpWaw1pTI4AazjWI6xJH1JyQARAQABtB9MYXVuY2hwYWQg + UFBBIGZvciBUZWxlZ3JhZiBEZXZziQI4BBMBAgAiBQJXFUriAhsDBgsJCAcDAgYVCAIJCgsE + FgIDAQIeAQIXgAAKCRDxDL4ByUQG9UgbEACa4IzdeYxH/S5I6MrZfvWNo/JTZ/MZWDD+QlMW + 60ThAemCUSE+NJvZZ1q7ovGFpYnHJT9GQXOwJAX1quDUqyM1uXNmLlOyIVNnmjUTINoLhw2V + iC8E7dMWC9w4Na2fKezmNHH00kNl43ncstIjjZ3pLnDGYm1y0ItiCUcTRgHhx2cUZ/vStz1S + Pdqj4P3i8vuspoYJ2T3VPlM/0G+u9Yjuy3Uzu9RugOyO3UJPoi3+4O2VTNosSBy5MILVCp49 + eigyFVGpq5sT/c86qd1zqmsNWEubrlzDfETS4LMj9epr46ZKPXGQkeryt1m2Oe0HkIdNZ+IQ + 5p+i9fnEy7/1uKTXWQYsg2UWsLA2PvTvwY8JxxMhUFgv12q2w7STntqJyi9PLItYNtbtKoS3 + XZCCMqQLCWMXHY+2ol6rRSfs06H/wzlR8LjDaEXkDVuDmqMtcbgTboZYblsGxst7I/Y4Wgfi + J52uiIyobQ69uJbG0XeRTLZ3WyrBkopEsTX/+sQjVqbADXYU4hBVDgnCf2uN/5dcwSEvDj8/ + +WsToAfEJkscRBsQjTLVzf+eFqHLrbqz/yoYIqBc//IJMBSbxIf5mrOHHLdbOuMCB6PVwpTI + vLFOSDNPuVDX+S1goA8KJTnXpm8jWDynn3XaXx3AlYw4iZ0ETSgQLQLRd6JuPOEGXsGdBA== + =ufaX + -----END PGP PUBLIC KEY BLOCK----- + +relations: + + # grafana + - [ "grafana:juju-info", "filebeat:beats-host" ] + - [ "grafana:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + - [ "grafana:juju-info", "landscape-client:container" ] + + # graylog + - [ "graylog:elasticsearch", "elasticsearch:client" ] + - [ "graylog:mongodb", "graylog-mongodb:database" ] + - [ "graylog:beats", "filebeat:logstash" ] + - [ "graylog:nrpe-external-master", "nrpe-host:nrpe-external-master" ] + - [ "graylog:juju-info", "telegraf:juju-info" ] + - [ "graylog:juju-info", "landscape-client:container" ] + + # nagios + - [ "nagios:juju-info", "filebeat:beats-host" ] + - [ "nagios:monitors", "nrpe-container:monitors" ] + - [ "nagios:monitors", "nrpe-host:monitors" ] + - [ "nagios:juju-info", "landscape-client-bionic:container" ] + + # openstack-service-checks + - [ "openstack-service-checks:identity-credentials", "keystone:identity-credentials" ] + - [ "openstack-service-checks:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + - [ "openstack-service-checks:juju-info", "filebeat:beats-host" ] + - [ "openstack-service-checks:juju-info", "landscape-client:container" ] + + # graylog-mongodb + - [ "graylog-mongodb:juju-info", "filebeat:beats-host" ] + - [ "graylog-mongodb:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + - [ "graylog-mongodb:juju-info", "landscape-client:container" ] + + # elasticsearch + - [ "elasticsearch:juju-info", "filebeat:beats-host" ] + - [ "elasticsearch:juju-info", "telegraf:juju-info" ] + - [ "elasticsearch:nrpe-external-master", "nrpe-host:nrpe-external-master" ] + - [ "elasticsearch:juju-info", "landscape-client:container" ] + + # prometheus + - [ "prometheus:juju-info", "filebeat:beats-host" ] + - [ "prometheus:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + - [ "prometheus:juju-info", "telegraf-prometheus:juju-info" ] + - [ "prometheus:grafana-source", "grafana:grafana-source" ] + - [ "prometheus:target", "telegraf:prometheus-client" ] + - [ "prometheus:juju-info", "landscape-client:container" ] + + # prometheus-openstack-exporter + - [ "prometheus-openstack-exporter:identity-credentials", "keystone:identity-credentials" ] + - [ "prometheus-openstack-exporter:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + - [ "prometheus-openstack-exporter:prometheus-openstack-exporter-service", "prometheus:target" ] + - [ "prometheus-openstack-exporter:juju-info", "filebeat:beats-host" ] + - [ "prometheus-openstack-exporter:juju-info", "landscape-client:container" ] + + # grafana dashboards + - [ "grafana:dashboards", "telegraf:dashboards" ] + - [ "grafana:dashboards", "telegraf-prometheus:dashboards" ] + + # vault lma/monitoring + - [ "filebeat:beats-host", "vault:juju-info" ] + - [ "nrpe-container:nrpe-external-master", "vault:nrpe-external-master" ] + + - [ "filebeat:beats-host", "etcd:juju-info" ] + - [ "nrpe-container:nrpe-external-master", "etcd:nrpe-external-master" ] + + - [ "filebeat:beats-host", "easyrsa:juju-info" ] + - [ "nrpe-container:general-info", "easyrsa:juju-info" ] + + + - [ "nova-compute:juju-info", "filebeat:beats-host" ] +# - [ "nova-compute:juju-info", "telegraf:juju-info" ] + - [ "nova-compute:nrpe-external-master", "nrpe-host:nrpe-external-master" ] + + - [ "ceph-osd:juju-info", "telegraf:juju-info" ] + + - [ "neutron-gateway:juju-info", "filebeat:beats-host" ] + - [ "neutron-gateway:juju-info", "telegraf:juju-info" ] + - [ "neutron-gateway:nrpe-external-master", "nrpe-host:nrpe-external-master" ] + + - [ "keystone:juju-info", "filebeat:beats-host" ] + - [ "keystone:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + + - [ "glance:juju-info", "filebeat:beats-host" ] + - [ "glance:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + + - [ "cinder:juju-info", "filebeat:beats-host" ] + - [ "cinder:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + +# - [ "cinder2:juju-info", "filebeat:beats-host" ] +# - [ "cinder2:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + + - [ "heat:juju-info", "filebeat:beats-host" ] + - [ "heat:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + + - [ "mysql-innodb-cluster:juju-info", "filebeat:beats-host" ] + - [ "mysql-innodb-cluster:juju-info", "nrpe-container:general-info" ] + + - [ "ceph-mon:prometheus", "prometheus:target" ] + - [ "ceph-mon:juju-info", "filebeat:beats-host" ] + - [ "ceph-mon:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + + - [ "neutron-api:juju-info", "filebeat:beats-host" ] + - [ "neutron-api:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + + - [ "rabbitmq-server:juju-info", "filebeat:beats-host" ] + - [ "rabbitmq-server:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + + - [ "openstack-dashboard:juju-info", "filebeat:beats-host" ] + - [ "openstack-dashboard:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + + - [ "nova-cloud-controller:juju-info", "filebeat:beats-host" ] + - [ "nova-cloud-controller:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + + - [ "gnocchi:juju-info", "filebeat:beats-host" ] + - [ "gnocchi:juju-info", "nrpe-container:general-info" ] + + - [ "ceilometer:juju-info", "filebeat:beats-host" ] + - [ "ceilometer:nrpe-external-master", "nrpe-container:nrpe-external-master" ] + + - [ "aodh:juju-info", "filebeat:beats-host" ] + - [ "aodh:juju-info", "nrpe-container:general-info" ] + + - [ "placement:juju-info", "filebeat:beats-host" ] + - [ "placement:juju-info", "nrpe-container:general-info" ] + + - [ "memcached:juju-info", "filebeat:beats-host" ] + - [ "memcached:juju-info", "nrpe-container:general-info" ] + + - [ "juniper-server:juju-info", "filebeat:beats-host" ] + - [ "juniper-server:juju-info", "telegraf:juju-info" ] + - [ "juniper-server:juju-info", "nrpe-host:general-info" ] + + - [ "landscape-server:juju-info", "filebeat:beats-host" ] + - [ "landscape-server:juju-info", "nrpe-host:general-info" ] + - [ "landscape-server:juju-info", "telegraf:juju-info" ] + + - [ "landscape-rabbitmq-server:juju-info", "filebeat:beats-host" ] + - [ "landscape-rabbitmq-server:nrpe-external-master", "nrpe-host:nrpe-external-master" ] + + - [ "landscape-postgresql:juju-info", "filebeat:beats-host" ] + - [ "landscape-postgresql:local-monitors", "nrpe-host:local-monitors" ] + - [ "landscape-postgresql:juju-info", "nrpe-host:general-info" ] + + - [ "landscape-haproxy:juju-info", "filebeat:beats-host" ] + - [ "landscape-haproxy:juju-info", "nrpe-host:general-info" ] + - [ "landscape-haproxy:local-monitors", "nrpe-host:local-monitors" ] + diff --git a/config/juju_deploy_focal.sh b/config/juju_deploy_focal.sh index 0524871..5d03056 100755 --- a/config/juju_deploy_focal.sh +++ b/config/juju_deploy_focal.sh @@ -18,12 +18,12 @@ juju deploy ./bundle_${series}.yaml \ --overlay ./overlays/openstack_versioned_overlay_${series}.yaml \ --overlay ./overlays/stsstack.yaml $* +# --overlay ./overlays/lma.yaml \ # --overlay ./overlays/lma_offers.yaml \ # --overlay ./overlays/advanced-routing.yaml \ # --overlay ./overlays/landscape.yaml \ # --overlay ./overlays/ssl.yaml \ # --overlay ./overlays/ssl_${series}.yaml \ -# --overlay ./overlays/lma.yaml \ # --overlay ./overlays/contrail.yaml \ # --overlay ./overlays/contrail_versioned_overlay.yaml \ diff --git a/config/juju_deploy_lma.sh b/config/juju_deploy_lma.sh new file mode 100755 index 0000000..e5013c8 --- /dev/null +++ b/config/juju_deploy_lma.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +series=focal + +juju model-config -m lma default-series=${series} + +juju deploy -m lma ./bundle_lma.yaml \ + --map-machines=existing $* + diff --git a/config/overlays/lma.yaml b/config/overlays/lma.yaml index 1382dda..0efde93 100644 --- a/config/overlays/lma.yaml +++ b/config/overlays/lma.yaml @@ -383,21 +383,13 @@ relations: - [ "placement:juju-info", "filebeat:beats-host" ] - [ "placement:juju-info", "nrpe-container:general-info" ] + - [ "memcached:juju-info", "filebeat:beats-host" ] + - [ "memcached:juju-info", "nrpe-container:general-info" ] + - [ "juniper-server:juju-info", "filebeat:beats-host" ] - [ "juniper-server:juju-info", "telegraf:juju-info" ] - [ "juniper-server:juju-info", "nrpe-host:general-info" ] - - [ "hacluster-aodh:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "hacluster-cinder:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "hacluster-glance:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "hacluster-gnocchi:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "hacluster-heat:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "hacluster-horizon:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "hacluster-keystone:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "hacluster-neutron:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "hacluster-nova:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "hacluster-placement:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "landscape-server:juju-info", "filebeat:beats-host" ] - [ "landscape-server:juju-info", "nrpe-host:general-info" ] - [ "landscape-server:juju-info", "telegraf:juju-info" ] diff --git a/config/overlays/openstack_versioned_overlay_focal.yaml b/config/overlays/openstack_versioned_overlay_focal.yaml index 27ee902..16c02e1 100644 --- a/config/overlays/openstack_versioned_overlay_focal.yaml +++ b/config/overlays/openstack_versioned_overlay_focal.yaml @@ -1,11 +1,18 @@ +# +# Some useful details on channels in the document below +# +# https://docs.openstack.org/charm-guide/latest/project/charm-delivery.html +# + variables: - charm-series: &charm-series focal - charm-arch: &charm-arch amd64 - mysql-channel: &mysql-channel "8.0/stable" - os-channel: &os-channel "ussuri/stable" - ceph-channel: &ceph-channel "octopus/stable" - ha-channel: &hacluster-channel "2.0.3/stable" - rmq-channel: &rmq-channel "3.8/stable" + charm-series: &charm-series focal + charm-arch: &charm-arch amd64 + mysql-channel: &mysql-channel "8.0/stable" + os-channel: &os-channel "ussuri/stable" + ceph-channel: &ceph-channel "octopus/stable" + hacluster-channel: &hacluster-channel "2.0.3/stable" + rmq-channel: &rmq-channel "3.8/stable" + default-channel: &default-channel "latest/stable" applications: aodh: @@ -30,9 +37,9 @@ applications: # ceph-osd2: # charm: ceph-osd # channel: *ceph-channel -# ceph-radosgw: -# charm: ceph-radosgw -# channel: *ceph-channel + ceph-radosgw: + charm: ceph-radosgw + channel: *ceph-channel cinder: charm: cinder channel: *os-channel @@ -44,21 +51,23 @@ applications: channel: *os-channel controller-server: charm: ubuntu - channel: latest/stable + channel: *default-channel lma-server: charm: ubuntu - channel: latest/stable + channel: *default-channel series: bionic easyrsa: charm: cs:~containers/easyrsa-408 elasticsearch: - charm: cs:elasticsearch-52 + charm: elasticsearch + channel: *default-channel etcd: charm: cs:etcd-583 external-advanced-routing: charm: cs:advanced-routing-5 filebeat: - charm: cs:filebeat-33 + charm: filebeat + channel: *default-channel glance: charm: glance channel: *os-channel @@ -104,9 +113,9 @@ applications: hacluster-nova: charm: hacluster channel: *hacluster-channel -# hacluster-radosgw: -# charm: hacluster -# channel: *hacluster-channel + hacluster-radosgw: + charm: hacluster + channel: *hacluster-channel hacluster-vault: charm: hacluster channel: *hacluster-channel @@ -115,7 +124,7 @@ applications: channel: *os-channel juniper-server: charm: ubuntu - channel: latest/stable + channel: *default-channel keystone-ldap-domain1: charm: keystone-ldap channel: *os-channel @@ -145,16 +154,19 @@ applications: charm: cs:landscape-server-39 series: bionic ldap-domain1: - charm: cs:~openstack-charmers/ldap-test-fixture-4 + charm: openstack-charmers-ldap-test-fixture + channel: *default-channel ldap-domain2: - charm: cs:~openstack-charmers/ldap-test-fixture-4 + charm: openstack-charmers-ldap-test-fixture + channel: *default-channel ldap-domain3: - charm: cs:~openstack-charmers/ldap-test-fixture-4 + charm: openstack-charmers-ldap-test-fixture + channel: *default-channel # lldpd: # charm: cs:lldpd-9 memcached: charm: memcached - channel: latest/stable + channel: *default-channel mysql-innodb-cluster: charm: mysql-innodb-cluster channel: *mysql-channel @@ -193,7 +205,7 @@ applications: channel: *mysql-channel nagios: charm: nagios - channel: latest/stable + channel: *default-channel series: bionic neutron-gateway: charm: neutron-gateway @@ -215,13 +227,13 @@ applications: channel: *os-channel nrpe-container: charm: nrpe - channel: latest/stable + channel: *default-channel nrpe-host: charm: nrpe - channel: latest/stable + channel: *default-channel # nrpe-kvm: # charm: nrpe -# channel: latest/stable +# channel: *default-channel ntp: charm: cs:ntp-46 openstack-dashboard: @@ -238,15 +250,17 @@ applications: charm: rabbitmq-server channel: *rmq-channel sysconfig-compute: - charm: cs:sysconfig-2 + charm: sysconfig + channel: *default-channel sysconfig-control: - charm: cs:sysconfig-2 + charm: sysconfig + channel: *default-channel telegraf: charm: telegraf - channel: latest/stable + channel: *default-channel telegraf-prometheus: charm: telegraf - channel: latest/stable + channel: *default-channel # thruk-agent: # charm: cs:thruk-agent-10 vault: