From d8ab09cc561ecbf61439a15a0e5b85cc8b4014c8 Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Tue, 21 Dec 2021 20:38:33 +0000 Subject: [PATCH] further focal improvements * Remove telegraf from lxd units, don't need them * Add placement hostnames for focal/ussuri builds --- config/bundle_focal.yaml | 28 ---------------------------- config/juju_deploy_focal.sh | 1 + config/overlays/hostnames_focal.yaml | 8 ++++++++ 3 files changed, 9 insertions(+), 28 deletions(-) create mode 100644 config/overlays/hostnames_focal.yaml diff --git a/config/bundle_focal.yaml b/config/bundle_focal.yaml index c35e927..42962e4 100644 --- a/config/bundle_focal.yaml +++ b/config/bundle_focal.yaml @@ -1416,31 +1416,26 @@ relations: - [ "etcd:db", "vault:etcd" ] # vault lma/monitoring - - [ "telegraf:juju-info", "vault:juju-info" ] - [ "filebeat:beats-host", "vault:juju-info" ] - [ "nrpe-container:nrpe-external-master", "vault:nrpe-external-master" ] - [ "landscape-client:container", "vault:juju-info" ] - - [ "telegraf:juju-info", "etcd:juju-info" ] - [ "filebeat:beats-host", "etcd:juju-info" ] - [ "nrpe-container:nrpe-external-master", "etcd:nrpe-external-master" ] - [ "landscape-client:container", "etcd:juju-info" ] - - [ "telegraf:juju-info", "easyrsa:juju-info" ] - [ "filebeat:beats-host", "easyrsa:juju-info" ] - [ "nrpe-container:general-info", "easyrsa:juju-info" ] - [ "landscape-client:container", "easyrsa:juju-info" ] # memcached - [ "memcached:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "memcached:juju-info", "telegraf:juju-info" ] - [ "memcached:juju-info", "filebeat:beats-host" ] - [ "memcached:juju-info", "landscape-client:container" ] # grafana - [ "grafana:juju-info", "filebeat:beats-host" ] - [ "grafana:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - - [ "grafana:juju-info", "telegraf:juju-info" ] - [ "grafana:juju-info", "landscape-client:container" ] # graylog @@ -1453,7 +1448,6 @@ relations: # nagios - [ "nagios:juju-info", "filebeat:beats-host" ] - - [ "nagios:juju-info", "telegraf:juju-info" ] - [ "nagios:monitors", "nrpe-container:monitors" ] - [ "nagios:monitors", "nrpe-host:monitors" ] - [ "nagios:juju-info", "landscape-client-bionic:container" ] @@ -1461,12 +1455,10 @@ relations: # 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", "telegraf:juju-info" ] - [ "openstack-service-checks:juju-info", "filebeat:beats-host" ] - [ "openstack-service-checks:juju-info", "landscape-client:container" ] # graylog-mongodb - - [ "graylog-mongodb:juju-info", "telegraf:juju-info" ] - [ "graylog-mongodb:juju-info", "filebeat:beats-host" ] - [ "graylog-mongodb:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "graylog-mongodb:juju-info", "landscape-client:container" ] @@ -1490,7 +1482,6 @@ relations: - [ "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", "telegraf:juju-info" ] - [ "prometheus-openstack-exporter:juju-info", "landscape-client:container" ] # prometheus-ceph-exporter @@ -1498,7 +1489,6 @@ relations: - [ "prometheus-ceph-exporter:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "prometheus-ceph-exporter:ceph-exporter", "prometheus:target" ] - [ "prometheus-ceph-exporter:juju-info", "filebeat:beats-host" ] - - [ "prometheus-ceph-exporter:juju-info", "telegraf:juju-info" ] - [ "prometheus-ceph-exporter:juju-info", "landscape-client:container" ] # juniper server @@ -1520,77 +1510,62 @@ relations: - [ "neutron-gateway:juju-info", "landscape-client:container" ] - [ "keystone:juju-info", "filebeat:beats-host" ] - - [ "keystone:juju-info", "telegraf:juju-info" ] - [ "keystone:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "keystone:juju-info", "landscape-client:container" ] - [ "glance:juju-info", "filebeat:beats-host" ] - - [ "glance:juju-info", "telegraf:juju-info" ] - [ "glance:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "glance:juju-info", "landscape-client:container" ] - [ "cinder:juju-info", "filebeat:beats-host" ] - - [ "cinder:juju-info", "telegraf:juju-info" ] - [ "cinder:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "cinder:juju-info", "landscape-client:container" ] # - [ "cinder2:juju-info", "filebeat:beats-host" ] -# - [ "cinder2:juju-info", "telegraf:juju-info" ] # - [ "cinder2:nrpe-external-master", "nrpe-container:nrpe-external-master" ] # - [ "cinder2:juju-info", "landscape-client:container" ] - [ "heat:juju-info", "filebeat:beats-host" ] - - [ "heat:juju-info", "telegraf:juju-info" ] - [ "heat:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "heat:juju-info", "landscape-client:container" ] - [ "mysql-innodb-cluster:juju-info", "filebeat:beats-host" ] - - [ "mysql-innodb-cluster:juju-info", "telegraf:juju-info" ] - [ "mysql-innodb-cluster:juju-info", "nrpe-container:general-info" ] - [ "mysql-innodb-cluster:juju-info", "landscape-client:container" ] - [ "ceph-mon:juju-info", "filebeat:beats-host" ] - - [ "ceph-mon:juju-info", "telegraf:juju-info" ] - [ "ceph-mon:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "ceph-mon:juju-info", "landscape-client:container" ] - [ "neutron-api:juju-info", "filebeat:beats-host" ] - - [ "neutron-api:juju-info", "telegraf:juju-info" ] - [ "neutron-api:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "neutron-api:juju-info", "landscape-client:container" ] - [ "rabbitmq-server:juju-info", "filebeat:beats-host" ] - - [ "rabbitmq-server:juju-info", "telegraf:juju-info" ] - [ "rabbitmq-server:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "rabbitmq-server:juju-info", "landscape-client:container" ] - [ "openstack-dashboard:juju-info", "filebeat:beats-host" ] - - [ "openstack-dashboard:juju-info", "telegraf:juju-info" ] - [ "openstack-dashboard:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "openstack-dashboard:juju-info", "landscape-client:container" ] - [ "nova-cloud-controller:juju-info", "filebeat:beats-host" ] - - [ "nova-cloud-controller:juju-info", "telegraf:juju-info" ] - [ "nova-cloud-controller:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "nova-cloud-controller:juju-info", "landscape-client:container" ] - [ "gnocchi:juju-info", "filebeat:beats-host" ] - - [ "gnocchi:juju-info", "telegraf:juju-info" ] - [ "gnocchi:juju-info", "nrpe-container:general-info" ] - [ "gnocchi:juju-info", "landscape-client:container" ] - [ "ceilometer:juju-info", "filebeat:beats-host" ] - - [ "ceilometer:juju-info", "telegraf:juju-info" ] - [ "ceilometer:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "ceilometer:juju-info", "landscape-client:container" ] - [ "aodh:juju-info", "filebeat:beats-host" ] - - [ "aodh:juju-info", "telegraf:juju-info" ] - [ "aodh:juju-info", "nrpe-container:general-info" ] - [ "aodh:juju-info", "landscape-client:container" ] - [ "placement:juju-info", "filebeat:beats-host" ] - - [ "placement:juju-info", "telegraf:juju-info" ] - [ "placement:juju-info", "nrpe-container:general-info" ] - [ "placement:juju-info", "landscape-client:container" ] @@ -1620,20 +1595,17 @@ relations: - [ "landscape-rabbitmq-server:juju-info", "ntp:juju-info" ] - [ "landscape-rabbitmq-server:juju-info", "filebeat:beats-host" ] - [ "landscape-rabbitmq-server:nrpe-external-master", "nrpe-host:nrpe-external-master" ] - - [ "landscape-rabbitmq-server:juju-info", "telegraf:juju-info" ] - [ "landscape-rabbitmq-server:juju-info", "landscape-client:container" ] - [ "landscape-postgresql:juju-info", "ntp:juju-info" ] - [ "landscape-postgresql:juju-info", "filebeat:beats-host" ] - [ "landscape-postgresql:local-monitors", "nrpe-host:local-monitors" ] - [ "landscape-postgresql:juju-info", "nrpe-host:general-info" ] - - [ "landscape-postgresql:juju-info", "telegraf:juju-info" ] - [ "landscape-postgresql:juju-info", "landscape-client-bionic:container" ] - [ "landscape-haproxy:juju-info", "filebeat:beats-host" ] - [ "landscape-haproxy:juju-info", "nrpe-host:general-info" ] - [ "landscape-haproxy:local-monitors", "nrpe-host:local-monitors" ] - - [ "landscape-haproxy:juju-info", "telegraf:juju-info" ] - [ "landscape-haproxy:juju-info", "landscape-client:container" ] - [ "landscape-server:amqp", "landscape-rabbitmq-server:amqp" ] diff --git a/config/juju_deploy_focal.sh b/config/juju_deploy_focal.sh index cb7fed6..8d961ef 100755 --- a/config/juju_deploy_focal.sh +++ b/config/juju_deploy_focal.sh @@ -9,6 +9,7 @@ juju model-config default-series=${series} juju deploy ./bundle_${series}.yaml \ --overlay ./overlays/ovs.yaml \ --overlay ./overlays/hostnames.yaml \ + --overlay ./overlays/hostnames_${series}.yaml \ --overlay ./overlays/ldap.yaml \ --overlay ./overlays/resources.yaml \ --overlay ./overlays/openstack_versioned_overlay_${series}.yaml \ diff --git a/config/overlays/hostnames_focal.yaml b/config/overlays/hostnames_focal.yaml new file mode 100644 index 0000000..c898b01 --- /dev/null +++ b/config/overlays/hostnames_focal.yaml @@ -0,0 +1,8 @@ +--- +applications: + + placement: + options: + os-public-hostname: placement.example.com + os-internal-hostname: &placement-int placement-internal.example.com + os-admin-hostname: *placement-int