From 587464e0929ecaf971a445fff224e8991ed85d4c Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Tue, 12 Jul 2022 21:12:31 +0100 Subject: [PATCH] Add multiple files and update many configs * Add extra text vlan info bucketsconfig.yaml and networks.yaml * Use ubuntu charm for juju controller, and rename it * Remove prometheus-ceph-exporter, as this is not longer working in ussuri * Add ceph-mon to prometheus relation for ceph metrics * use ceph-osd instead of nova-compute for telegraf * Update lxd-snap-channel to 5.0/stable * Add SSL details to juju_deploy_focal script * Update certs * Add default password for grafana * Generalise tag creation in Landscape based on juju * Usef FQDN for landscape urls --- config/bucketsconfig.yaml | 9 + config/bundle_controller.yaml | 12 +- config/bundle_focal.yaml | 20 +- config/juju-model-default-cis.yaml | 2 +- config/juju-model-default.yaml | 2 +- config/juju_deploy_focal.sh | 4 +- config/networks.yaml | 15 ++ config/overlays/ssl.yaml | 36 +-- config/overlays/stsstack.yaml | 3 + config/ssl/cacert.pem | 52 ++--- config/ssl/servercert.pem | 212 +++++++++--------- config/ssl/serverkey.pem | 52 ++--- scripts/arif-scripts/do_landscape_tags.sh | 51 +++-- .../update_landscape_certs_self.sh | 8 +- 14 files changed, 239 insertions(+), 239 deletions(-) diff --git a/config/bucketsconfig.yaml b/config/bucketsconfig.yaml index 6af140d..f4a94c9 100644 --- a/config/bucketsconfig.yaml +++ b/config/bucketsconfig.yaml @@ -355,6 +355,15 @@ configs: subnets: [external] fabric: default + # ens9.307 NIC + - id: ens9.307 + name: ens9.307 + subnets: [test-space] + type: vlan + vlan_id: 307 + vlan_link: ens9 + fabric: default + lma: disks: *common-disks nics: *common-nics diff --git a/config/bundle_controller.yaml b/config/bundle_controller.yaml index 9e99518..916a1d5 100644 --- a/config/bundle_controller.yaml +++ b/config/bundle_controller.yaml @@ -105,8 +105,8 @@ applications: vLFOSDNPuVDX+S1goA8KJTnXpm8jWDynn3XaXx3AlYw4iZ0ETSgQLQLRd6JuPOEGXsGdBA== =ufaX -----END PGP PUBLIC KEY BLOCK----- - controller-server: - charm: cs:~jameinel/ubuntu-lite + juju-controller: + charm: cs:ubuntu-18 bindings: "": *oam-space num_units: 3 @@ -115,10 +115,10 @@ applications: - "1" - "2" relations: - - [ "controller-server:juju-info", "landscape-client:container" ] - - [ "controller-server:juju-info", "telegraf:juju-info" ] - - [ "controller-server:juju-info", "nrpe:general-info" ] - - [ "controller-server:juju-info", "filebeat:beats-host" ] + - [ "juju-controller:juju-info", "landscape-client:container" ] + - [ "juju-controller:juju-info", "telegraf:juju-info" ] + - [ "juju-controller:juju-info", "nrpe:general-info" ] + - [ "juju-controller:juju-info", "filebeat:beats-host" ] # via CMR - [ "filebeat:logstash", "graylog:beats" ] diff --git a/config/bundle_focal.yaml b/config/bundle_focal.yaml index 61def8c..38594d2 100644 --- a/config/bundle_focal.yaml +++ b/config/bundle_focal.yaml @@ -1203,14 +1203,6 @@ applications: # DCE3Nw== # =Kaig # -----END PGP PUBLIC KEY BLOCK----- - prometheus-ceph-exporter: - charm: cs:prometheus-ceph-exporter - bindings: - "": *oam-space - ceph: *ceph-public-space - num_units: 1 - to: - - lxd:200 # external-policy-routing: # charm: cs:~canonical-bootstack/policy-routing # options: @@ -1485,13 +1477,6 @@ relations: - [ "prometheus-openstack-exporter:juju-info", "filebeat:beats-host" ] - [ "prometheus-openstack-exporter:juju-info", "landscape-client:container" ] - # prometheus-ceph-exporter - - [ "prometheus-ceph-exporter:ceph", "ceph-mon:client" ] - - [ "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", "landscape-client:container" ] - # juniper server - [ "juniper-server:juju-info", "ntp:juju-info" ] @@ -1501,10 +1486,12 @@ relations: # LMA/landscape subordinates - [ "nova-compute:juju-info", "filebeat:beats-host" ] - - [ "nova-compute:juju-info", "telegraf:juju-info" ] +# - [ "nova-compute:juju-info", "telegraf:juju-info" ] - [ "nova-compute:nrpe-external-master", "nrpe-host:nrpe-external-master" ] - [ "nova-compute:juju-info", "landscape-client:container" ] + - [ "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" ] @@ -1534,6 +1521,7 @@ relations: - [ "mysql-innodb-cluster:juju-info", "nrpe-container:general-info" ] - [ "mysql-innodb-cluster:juju-info", "landscape-client:container" ] + - [ "ceph-mon:prometheus", "prometheus:target" ] - [ "ceph-mon:juju-info", "filebeat:beats-host" ] - [ "ceph-mon:nrpe-external-master", "nrpe-container:nrpe-external-master" ] - [ "ceph-mon:juju-info", "landscape-client:container" ] diff --git a/config/juju-model-default-cis.yaml b/config/juju-model-default-cis.yaml index 29c8072..339e449 100644 --- a/config/juju-model-default-cis.yaml +++ b/config/juju-model-default-cis.yaml @@ -151,7 +151,7 @@ cloudinit-userdata: | "00": systemctl restart snapd apt-mirror: http://192.168.1.12/archive.ubuntu.com/ubuntu -lxd-snap-channel: "4.19/stable" +lxd-snap-channel: "5.0/stable" container-image-metadata-url: http://192.168.1.12/lxd/ container-image-stream: released diff --git a/config/juju-model-default.yaml b/config/juju-model-default.yaml index c020161..9b9e1e8 100644 --- a/config/juju-model-default.yaml +++ b/config/juju-model-default.yaml @@ -37,7 +37,7 @@ cloudinit-userdata: | "00": systemctl restart snapd apt-mirror: http://192.168.1.12/archive.ubuntu.com/ubuntu -lxd-snap-channel: "4.19/stable" +lxd-snap-channel: "5.0/stable" container-image-metadata-url: http://192.168.1.12/lxd/ container-image-stream: released diff --git a/config/juju_deploy_focal.sh b/config/juju_deploy_focal.sh index 2ab18f4..67da58f 100755 --- a/config/juju_deploy_focal.sh +++ b/config/juju_deploy_focal.sh @@ -2,7 +2,7 @@ series=focal -juju model-config juju-model-default.yaml +juju model-config ./juju-model-default.yaml juju model-config default-series=${series} @@ -14,6 +14,8 @@ juju deploy ./bundle_${series}.yaml \ --overlay ./overlays/resources.yaml \ --overlay ./overlays/openstack_versioned_overlay_${series}.yaml \ --overlay ./overlays/lma_offers.yaml \ + --overlay ./overlays/ssl.yaml \ + --overlay ./overlays/ssl_${series}.yaml \ --overlay ./overlays/stsstack.yaml $* # --overlay ./overlays/contrail.yaml \ diff --git a/config/networks.yaml b/config/networks.yaml index abe0e3e..dbd9877 100644 --- a/config/networks.yaml +++ b/config/networks.yaml @@ -117,6 +117,21 @@ fabrics: servers: start_ip: 10.0.6.241 end_ip: 10.0.6.254 + 307: + dhcp_on: true + mtu: 1500 + space: test-space + subnets: + admin: + cidr: 10.0.7.0/24 + reserved: + maas: + start_ip: 10.0.7.1 + end_ip: 10.0.7.99 + type: dynamic + servers: + start_ip: 10.0.7.241 + end_ip: 10.0.7.254 spaces: ceph-access: diff --git a/config/overlays/ssl.yaml b/config/overlays/ssl.yaml index 29da832..cdbef3d 100644 --- a/config/overlays/ssl.yaml +++ b/config/overlays/ssl.yaml @@ -83,41 +83,7 @@ applications: landscape-client: options: # this charm expects that the variable startswith base64: string. The rest is identical to the *ssl_ca value. - ssl-public-key: "base64:LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZqekNDQTNlZ0F3SUJBZ0lVWGdQbWZkdktY -YXVNbHNqTjhVeTJuTWdhamF3d0RRWUpLb1pJaHZjTkFRRUwKQlFBd1Z6RUxNQWtHQTFVRUJoTUNS -MEl4RURBT0JnTlZCQWdNQjBWdVoyeGhibVF4RHpBTkJnTlZCQWNNQmt4dgpibVJ2YmpFVk1CTUdB -MVVFQ2d3TVZXSjFiblIxSUVOc2IzVmtNUTR3REFZRFZRUUxEQVZEYkc5MVpEQWVGdzB5Ck1UQXlN -VEV4TWpRNU1URmFGdzB5TWpBeU1URXhNalE1TVRGYU1GY3hDekFKQmdOVkJBWVRBa2RDTVJBd0Rn -WUQKVlFRSURBZEZibWRzWVc1a01ROHdEUVlEVlFRSERBWk1iMjVrYjI0eEZUQVRCZ05WQkFvTURG -VmlkVzUwZFNCRApiRzkxWkRFT01Bd0dBMVVFQ3d3RlEyeHZkV1F3Z2dJaU1BMEdDU3FHU0liM0RR -RUJBUVVBQTRJQ0R3QXdnZ0lLCkFvSUNBUURpV2tiK3luRnBDVXgxakxlaFM0SUl4MDBjTm51OU81 -eTRSbExxZFQ1TXltQzZFRVdBK0RvRnA5VEMKRW10R3ViUWdXNklSVHlJRi9hKytZNGFlRG0vU0NW -TEJ1OWZGZSt3WVdEbDU1L1F6SUJVMUhkWEsrdnBIRlB3SQpVQjRKQlZEUi9UWWZmWG5IMmJTVnMx -eE8xOVRwb2krZ0d4OW5UaEpsMVpyN2pNRkpXbmlXUG5FdEVuSG51Z3owCll0VkRUbEp3OHo2ZmVN -ME1GQlprcWZmZmxoTEpYMlA1OURQM2ZXV1lzcEFSM29TemFwb1JsbURQbHZnZDU0T28KZnJubFlK -cTdyWTRVTmdYYXpUNkZPQklHcDVOTVk1S0M1dXBpbVVEdzZlbTZubW10TjVuZUhkdTR3YlBsRVp6 -Nwp1a2o1cFFCREcrOHJpazJhSFB3VkFaOXNZaTNJUXdCc0lvL1pwMHpGeGhkbnNXTzltanNXWWpY -RkJaaFg4UzZzCmZZUFZlSXd1VEsrenZMbkxxZmpCUHBKTG11Um5HT0VhT1RhME9UUUtHZHZncDhX -eFJjc2Y2VXVhTFduUWRURkMKNjFzOE1jVG5GbXhhdWg0TmhmVVYvZURjTlRxU29pZHlDM0lUVmdR -eWJyTis4UW52cnlKcjNycjFVcDl1MzZDRwpJN3dqOHY3dE8vU0tId2ZPcHQ2UmhGNFBrWVRyNnQy -TmR3cURsWnBFMFBTOU5Wbk91S2dubzZmVkpKK1dvaEhxCktTM2Vnckw1elNRbTdDZ2JUTEJyR3NS -UnVoNitVRjVhOWtnZGpkVHVTT1BGYlBLa283djE3VndqQ0VYSlZJUlcKSEF6OW1nd0RVTTNjOU9Z -cEZ2TCs0ZUNVbWc3Mm82djh2NUpGd2JDMUNqdkdMZW5ON1FJREFRQUJvMU13VVRBZApCZ05WSFE0 -RUZnUVVNWlZ5NndacERTR1dZOTQxcm5CUzdJTzgxMVF3SHdZRFZSMGpCQmd3Rm9BVU1aVnk2d1pw -CkRTR1dZOTQxcm5CUzdJTzgxMVF3RHdZRFZSMFRBUUgvQkFVd0F3RUIvekFOQmdrcWhraUc5dzBC -QVFzRkFBT0MKQWdFQU1TY0xMSFdRd1B3Y3YycTFrREkzdkg4bWNVU1ZFaG50VS9sVzNVeXh3eldi -VzZZVjJ5WFVtUmpKMlU1dApLRzc3RE5hUXF6T09HcEUwSjJuTDdlcHRoUW01SU1pNW5XNFFUa05C -YVVhOS9QQkk1UkxWZGZCRkZFT3NjQ3VtCnFqeEFQdWdYZHFJMWQreEFmZU9SNHcrY1E1UFNvVW1P -b3JXSzVZQ1BQaU1SVVJnVU50MGNZbjFGR0QzN2FIMUUKeng5RnN1U3lGekhBU1hMNCtYSFNYaHNB -MzJnRTA5SHIyUzRlbytSWUIwbnNreHlCWTBibG55c2d4QXFXMkFGSQo2aGhubTE5SldkZUdSUFBB -ZnRlWFRmNzlqcEF2Rmc2YWZmeWtaalZ4NDR1WSt5TCtNUTR3eEx2WHlrU2MxV3lJCkFwaG9HWkRW -WGxJZVorMVRLVnVXdnZPZlBveVJyYVRyeUtkRGtzNThzaWxBeWV4My9XTktidXRyRUN4V2Jvc0sK -LzkzWExRWnlVdmx0b2JncVpEWDF0Rk9NTDN3ZkdCZzl4dTczMTJ3NXhvN2c1WlFnT0lJaERkdzRw -OGlrekJHaQorZXdvNnhIblZEaE9UWGFCcmtuN3Rwbnh0NGRxQUdMdVJTRC9NV1crTTZXZThwNlI5 -TkRLWlBwdDdmVVk1NFlvCm9ISzlSYVMyeHZ3UGxWYjNqaHVKbkxDRWQ0eUdBQnEvcDhlWTZVV01P -TXBqbEFzT3FDN2pnSlRCc3hySnQvdnEKK3RYdDBZdVVTUW5seHBNV0hnVVdFcVMxU2t2R09JVjhZ -MTdGQXphVDRDV3VtSEJlUnFpNS83R2hKcUtSa05VZQo4NENDOWJQMkswN3ZkbGp1blNlR1dCbTJW -YXY3STdQQ0RoK0dQVmp2QnE1T2QvUT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=" + ssl-public-key: "base64:LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZqekNDQTNlZ0F3SUJBZ0lVUnVienpkeGZwdW1Kc2Y4cEd6SnVtLzFUcHBVd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1Z6RUxNQWtHQTFVRUJoTUNSMEl4RURBT0JnTlZCQWdNQjBWdVoyeGhibVF4RHpBTkJnTlZCQWNNQmt4dgpibVJ2YmpFVk1CTUdBMVVFQ2d3TVZXSjFiblIxSUVOc2IzVmtNUTR3REFZRFZRUUxEQVZEYkc5MVpEQWVGdzB5Ck1qQTJNekF4TXpFeU1UTmFGdzB5TWpBM016QXhNekV5TVROYU1GY3hDekFKQmdOVkJBWVRBa2RDTVJBd0RnWUQKVlFRSURBZEZibWRzWVc1a01ROHdEUVlEVlFRSERBWk1iMjVrYjI0eEZUQVRCZ05WQkFvTURGVmlkVzUwZFNCRApiRzkxWkRFT01Bd0dBMVVFQ3d3RlEyeHZkV1F3Z2dJaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQ0R3QXdnZ0lLCkFvSUNBUUNlYStvVXdEa1N0L1ZZWFZNanJDSFJ6M2Yzb3dDQVBsQUtjMzZ6dUxzQjcweXJGZk4xeWhPMFZUZUkKaUgzWVc0L09BajI2TzlPQ0FEcmhLTlZpc3ZvNTFValBTVnpVK2M1SVBhZ2VrNTJiQmE2RXZoK0RmZkJvRnBHUgo1YzB3Q1YyREkvL3luYXpKdDNZZWpDMkxyY3NMT0JkL3ptd1k5c3hIOGhyZ1lTZ0gvYlNpemE3N0pBY0pqZUNwCjhkUGxMT2pCbVpZOGxyakw5aCtRdFc3STFyUEQ1RUZoOTBpNTQ2VXdYY0lrdHhmUWNwZi9McjBqaFZyUmwxVTAKZ3hPdDRGWXdDWVdqaFJIQnpNOE5iQkQ0YWNwWk9yRU1VME1jdHdHSVZUM21VWDM4aXQ1NjR0elR1VmZ1K2RGRQpJS25YYklaL2JhNmRDSnA1RWx2dWxOSGdROEMxUWRFOWdsRy9aTUYyeDZGWjRkRU1pRWJtZE1LUUFuZGtQdDBICjQrVk1jKzJQaTBneG85aHNublB1RzBvbUVyUFAyUmtHbGd3ZFNKRmgyWU1PeXhVeWFWQzB5dnpOUFNYY0JhejMKS0NOY1FLZzBiSE54WCsxeEFyc0FyNCtsWHhEOC9GUXJuTUJRckEraHZ2V3N1bS9LMVd2SEVFMXF2SnUvWVR6QwpONEpsTjJXdlllK095Q1NBeFhEVVNqZkFaZWhNVGZuY29ab2FDWjlQb25tcVZwQzFLQnhUZDd6VFZ3RlBZWHZICng3L1VLd2pQSWo0Uit4VmQ3MWQrTkYxNjY1SFZOTy9uVTdVREZpc3hNbTZaeUlXYzJhVHdML293NzlKcUgwQ04Kak9YVFBSWDVzZHh5NEl3MDcvN2MvSDU0WlBZMzFkVk1HNkErcktHc2ZXdFlteC9jeHdJREFRQUJvMU13VVRBZApCZ05WSFE0RUZnUVVhMlVET3QwTXJVWDQvWktzVkVoTGRLV1o4UVV3SHdZRFZSMGpCQmd3Rm9BVWEyVURPdDBNCnJVWDQvWktzVkVoTGRLV1o4UVV3RHdZRFZSMFRBUUgvQkFVd0F3RUIvekFOQmdrcWhraUc5dzBCQVFzRkFBT0MKQWdFQVR6K0lBSDh1RWQvTW1Vb0ZvUUhFV3JTRE1vdVppenlhMWd2UnB2MGUxZHg5eEtBWWR3V3JlelZjWk9tegpkTWh4VEVVV01ORlNBVml5SGdOanlYaXRGdHlUN09ENGU3cW4wNU5lVDlLamJ6ODRYZmswUUdSTWMyNVpyc1lPCnE5aXFwM1FnNnN6Q0N1YmJxOEFXRnp2N3dnd3JXWUl0cE1xeStTZkkxVFU2VkR6OFRJaUZOV0xPc2swOVhkNS8KT2thcStNYnVPcDR4TGFLOWtmcDNHZjI4dC9VNFU0RjFhUmoyWDFDQmJGeFp5VkNIYkdYY0RCcXZad0hjaHlzOQpINXhqU3c0ZkRFK1ZFaUJSdW02NnJHTjMvVDV6aXJreGNHRzJDNlByb1RvckxVTDd1M1ltK1NUU0lpWElKUFl2CldYbENBRVltNTF2WndQSVhBenNnOE10NEdVYS95WVZFQXJrTktjYVNQWUtObk9ndDdlRW1BWjF2Y1pzTVJjb3MKSXYxOTFTV1Vlb2xXd3Z2RytKeUpIWmR3OFlqbXpTclVDTWFZalhhYUp4bzlveDJSWVcxeSsyN0wzUCt0VlQrUApoWDBFeEFDcDlXaWZraEVKMmpZS01TdjEreFhVMnc1VEdEeHdzYWlldndzbHVNYWxDZjBJM0hqR1FneW5oY0wvCnpuS2NDRklxR3d0L1NHQzd2MzFwbUNhMlNqamFQT3R4aWJYaFNWVXBweGF0WkkrbFp0L2lTVU5sUGhnYVI5QkcKcmFQaEE5U1VaaUxkQVN3ajNsbWxyZTlJdHRqM0Z6ejRUOGlXZ09ZNE1qSXB5YkVVNzg2dVpZSnJUUkt2RkVKQQpITE90bzhKeG9PTjY4NDRCVDBidEJMWUxUQVorUlBGRmNKelpmY1VFOGRucXo0RT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=" landscape-haproxy: options: ssl_cert: *ssl_crt diff --git a/config/overlays/stsstack.yaml b/config/overlays/stsstack.yaml index ad46f21..b177746 100644 --- a/config/overlays/stsstack.yaml +++ b/config/overlays/stsstack.yaml @@ -10,3 +10,6 @@ applications: nagios: options: password: openstack + grafana: + options: + admin_password: openstack diff --git a/config/ssl/cacert.pem b/config/ssl/cacert.pem index 795d716..ce19e5a 100644 --- a/config/ssl/cacert.pem +++ b/config/ssl/cacert.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/config/ssl/servercert.pem b/config/ssl/servercert.pem index 7f5c08a..03ea5e6 100644 --- a/config/ssl/servercert.pem +++ b/config/ssl/servercert.pem @@ -1,130 +1,132 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 15 (0xf) + Serial Number: 22 (0x16) Signature Algorithm: sha256WithRSAEncryption Issuer: C=GB, ST=England, L=London, O=Ubuntu Cloud, OU=Cloud Validity - Not Before: Feb 11 12:49:11 2021 GMT - Not After : Feb 11 12:49:11 2022 GMT - Subject: C=GB, ST=England, L=London, O=Ubuntu Cloud, OU=Cloud, CN=10.0.1.211 + Not Before: Jun 30 13:30:12 2022 GMT + Not After : Jun 30 13:30:12 2023 GMT + Subject: C=GB, ST=England, L=London, O=Ubuntu Cloud, OU=Cloud, CN=10.0.1.211} Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: - 00:c4:e4:ec:1a:64:c1:ec:15:05:72:47:82:ee:c6: - b1:12:a2:be:af:f1:52:d9:e5:97:52:35:11:b7:76: - da:53:54:99:60:87:28:d4:c4:55:70:c4:5a:c3:12: - 2c:62:9a:de:c9:92:30:a4:45:56:83:08:62:6e:18: - df:eb:ea:eb:c3:44:17:fe:6a:dc:c4:f6:98:be:10: - 7a:b4:f5:4d:9a:60:2f:6c:d1:40:e9:a6:57:79:f6: - c1:5f:7e:99:c4:86:12:a2:f0:7a:50:08:20:1e:a3: - 42:77:71:fa:2f:47:8b:26:30:91:cb:fa:55:38:fa: - 76:fe:15:4f:ec:d9:db:df:44:3c:e1:22:84:9f:6e: - cb:75:d2:0e:1d:93:c0:5a:83:ba:e8:13:e7:8f:13: - d9:e5:bc:52:04:d9:ea:68:62:e5:9d:00:11:42:ef: - 70:54:f9:69:02:e3:f7:46:6b:35:ce:2c:9a:80:93: - 7a:37:a5:4e:92:f1:b9:4a:47:13:f0:79:21:82:75: - 86:7b:91:ca:63:d7:60:23:66:26:35:c9:81:5b:d1: - 19:74:a0:e9:e9:72:c5:fb:18:55:f5:a1:ff:89:69: - 04:b1:36:81:f5:5b:a1:1d:b7:6c:c2:74:c9:04:50: - a4:c1:dd:be:14:6a:eb:cc:f6:17:5a:fb:95:39:53: - 46:71 + 00:97:80:12:7e:76:eb:eb:18:07:11:89:1c:04:bd: + 6b:79:61:b0:7e:51:38:d5:7f:4a:0b:4b:4a:e3:e0: + b5:5e:91:4c:f0:bc:99:72:a6:43:71:59:64:90:6f: + 97:42:d0:47:8c:e1:67:fd:b7:31:eb:f6:28:ef:84: + 60:39:04:65:82:71:1f:1b:54:0a:18:6e:bf:99:75: + 5e:9e:97:74:89:07:bc:7b:e0:1a:23:b6:37:c4:12: + d0:c0:05:f1:f9:a9:23:ee:f9:49:a8:70:aa:30:3a: + 3d:92:b0:ad:0f:a3:45:74:56:fc:93:de:d3:de:a0: + cf:9b:22:36:6b:61:c9:7a:2b:3c:14:20:3f:e4:fe: + b8:67:73:06:a6:85:a1:df:92:ad:bb:58:40:01:a5: + a6:61:2f:f3:ef:e9:ce:d0:03:b9:fa:68:4c:5b:0a: + b3:f2:e9:64:c3:6c:09:9a:43:6e:3d:af:5b:c9:62: + a5:0e:91:f4:5c:3f:63:31:72:bb:d5:68:8b:77:3a: + 01:4a:f4:c5:a9:dc:c8:3c:ee:5a:ea:c1:e8:ca:a3: + dc:0e:90:82:e0:4f:d1:46:9c:d8:98:e2:a0:89:ac: + 40:78:45:9e:2d:fa:5f:d9:7e:0a:b5:22:10:07:cb: + ed:6a:a0:8c:4b:1d:49:b4:5d:f5:7f:19:0f:b3:df: + b5:09 Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Subject Key Identifier: - CB:9B:67:C1:6B:30:93:13:FC:8A:BB:B0:CA:ED:CE:F4:F6:A2:95:65 + CB:B2:98:4A:C2:77:0B:11:74:FB:BB:C3:AB:FA:65:FF:E6:3B:3F:05 X509v3 Authority Key Identifier: - keyid:31:95:72:EB:06:69:0D:21:96:63:DE:35:AE:70:52:EC:83:BC:D7:54 - + 6B:65:03:3A:DD:0C:AD:45:F8:FD:92:AC:54:48:4B:74:A5:99:F1:05 X509v3 Basic Constraints: CA:FALSE X509v3 Key Usage: Digital Signature, Key Encipherment X509v3 Subject Alternative Name: - IP Address:10.0.1.211, IP Address:10.0.1.212, IP Address:10.0.1.213, IP Address:10.0.1.214, IP Address:10.0.1.215, IP Address:10.0.1.216, IP Address:10.0.1.217, IP Address:10.0.1.218, IP Address:10.0.1.219, IP Address:10.0.1.220, IP Address:10.0.1.221, IP Address:10.0.1.222, IP Address:10.0.1.223, IP Address:10.0.1.224, IP Address:10.0.1.225, IP Address:10.0.1.226, IP Address:10.0.1.227, IP Address:10.0.1.228, IP Address:10.0.1.229, IP Address:10.0.1.230, DNS:glance-internal.example.com, DNS:glance-public.example.com, DNS:glance.example.com, DNS:cinder-internal.example.com, DNS:cinder-public.example.com, DNS:cinder.example.com, DNS:nova-internal.example.com, DNS:nova-public.example.com, DNS:nova.example.com, DNS:keystone-internal.example.com, DNS:keystone-public.example.com, DNS:keystone.example.com, DNS:neutron-internal.example.com, DNS:neutron-public.example.com, DNS:neutron.example.com, DNS:horizon-internal.example.com, DNS:horizon-public.example.com, DNS:horizon.example.com, DNS:swift-internal.example.com, DNS:swift-public.example.com, DNS:swift.example.com, DNS:heat-internal.example.com, DNS:heat-public.example.com, DNS:heat.example.com, DNS:aodh-internal.example.com, DNS:aodh-public.example.com, DNS:aodh.example.com, DNS:ceilometer-internal.example.com, DNS:ceilometer-public.example.com, DNS:ceilometer.example.com, DNS:gnocchi-internal.example.com, DNS:gnocchi-public.example.com, DNS:gnocchi.example.com, DNS:nagios-internal.example.com, DNS:nagios-public.example.com, DNS:nagios.example.com, DNS:vault-int.example.com, DNS:vault-public.example.com, DNS:vault.example.com, DNS:landscape-internal.example.com, DNS:landscape-public.example.com, DNS:landscape.example.com + IP Address:10.0.1.211, IP Address:10.0.1.212, IP Address:10.0.1.213, IP Address:10.0.1.214, IP Address:10.0.1.215, IP Address:10.0.1.216, IP Address:10.0.1.217, IP Address:10.0.1.218, IP Address:10.0.1.219, IP Address:10.0.1.220, IP Address:10.0.1.221, IP Address:10.0.1.222, IP Address:10.0.1.223, IP Address:10.0.1.224, IP Address:10.0.1.225, IP Address:10.0.1.226, IP Address:10.0.1.227, IP Address:10.0.1.228, IP Address:10.0.1.229, IP Address:10.0.1.230, DNS:glance-internal.example.com, DNS:glance-public.example.com, DNS:glance.example.com, DNS:cinder-internal.example.com, DNS:cinder-public.example.com, DNS:cinder.example.com, DNS:nova-internal.example.com, DNS:nova-public.example.com, DNS:nova.example.com, DNS:keystone-internal.example.com, DNS:keystone-public.example.com, DNS:keystone.example.com, DNS:neutron-internal.example.com, DNS:neutron-public.example.com, DNS:neutron.example.com, DNS:horizon-internal.example.com, DNS:horizon-public.example.com, DNS:horizon.example.com, DNS:swift-internal.example.com, DNS:swift-public.example.com, DNS:swift.example.com, DNS:heat-internal.example.com, DNS:heat-public.example.com, DNS:heat.example.com, DNS:aodh-internal.example.com, DNS:aodh-public.example.com, DNS:aodh.example.com, DNS:ceilometer-internal.example.com, DNS:ceilometer-public.example.com, DNS:ceilometer.example.com, DNS:gnocchi-internal.example.com, DNS:gnocchi-public.example.com, DNS:gnocchi.example.com, DNS:nagios-internal.example.com, DNS:nagios-public.example.com, DNS:nagios.example.com, DNS:vault-internal.example.com, DNS:vault-public.example.com, DNS:vault.example.com, DNS:landscape-internal.example.com, DNS:landscape-public.example.com, DNS:landscape.example.com, DNS:placement-internal.example.com, DNS:placement-public.example.com, DNS:placement.example.com Netscape Comment: OpenSSL Generated Certificate Signature Algorithm: sha256WithRSAEncryption - 24:4f:fa:23:38:70:47:ca:67:a7:b3:df:60:d4:d4:e9:f1:2f: - 83:ca:94:41:cd:60:c2:31:ca:da:0c:1b:32:40:8d:ac:bd:05: - f6:29:39:fd:a3:77:12:76:8d:50:8d:bd:e0:f6:83:d4:1f:fa: - 96:f1:75:56:33:56:7b:9f:a6:c1:c5:5a:0e:28:fe:49:b0:ba: - 5a:56:4b:af:be:c1:6a:8d:78:35:90:d3:c5:69:91:19:61:0c: - 0c:5f:dd:cc:77:0b:6f:51:10:fe:06:cc:0e:f4:c2:65:c6:0b: - 61:2d:95:88:df:a7:9a:d2:9b:dd:96:04:f7:77:41:e2:2a:da: - 9b:a1:33:aa:de:ea:56:bb:78:d9:e5:dd:71:88:57:b2:d1:e8: - 8b:75:da:f8:dc:9c:8a:0b:a5:55:28:a3:4a:d1:a3:c4:06:4e: - b4:8e:e1:44:11:4b:04:5a:07:37:26:0c:2b:a5:03:bb:f6:15: - 8f:f3:e4:0f:a0:2a:b8:f7:c4:4d:e7:03:df:7c:58:0e:ca:67: - 2a:34:4b:5b:33:b2:b6:26:88:20:34:87:cd:fb:e5:27:7f:64: - 88:d5:f3:e8:6c:72:20:05:fb:bc:a1:0d:b7:d3:03:20:85:fb: - 88:ef:ce:a0:cd:8e:35:d9:14:3b:48:be:5c:46:8f:13:bd:53: - 04:93:51:d0:a7:a7:44:c2:81:9c:ff:70:ea:9f:07:73:31:e5: - 4a:e1:ad:2c:53:66:44:34:1e:e0:50:72:ad:28:67:00:2f:86: - c8:11:23:a8:a1:20:d0:b0:51:44:2b:eb:46:61:7f:fd:43:29: - da:d0:f1:8c:d1:b2:d8:6c:34:79:f8:b9:77:89:58:30:b6:00: - de:05:5e:94:f0:c4:d8:05:c0:f3:a9:d4:cf:8f:f3:4a:8a:dd: - 8c:bc:11:86:ae:d3:ec:e3:9a:ea:13:6a:db:2f:d2:53:84:3b: - b9:c5:98:23:d9:b6:4d:f5:c3:32:1f:6a:39:80:c4:66:b9:43: - 9e:9a:39:7d:08:12:ec:87:cb:38:d1:4c:93:0c:ce:d0:b2:0e: - db:a6:00:a2:99:c0:11:06:81:a9:1c:bf:d8:8c:7b:c2:71:3d: - 19:1a:61:c9:dd:ec:f9:44:ff:15:3a:1a:1f:d5:95:55:63:ee: - b2:35:01:81:83:89:b2:1a:a7:8d:5b:11:be:01:fc:3b:54:76: - ce:3b:6f:ae:6c:fc:b1:24:77:9e:4f:1a:82:02:20:0e:c5:24: - c4:5c:3f:23:1e:fe:b2:78:9b:0e:b1:91:4e:60:0f:26:ea:90: - 5d:09:bc:b4:ab:a9:e4:fa:2b:c3:d3:6c:d5:30:7a:e4:f2:eb: - c6:e7:fb:f4:dc:5c:e3:38 + Signature Value: + 98:23:9b:4f:90:94:1a:6e:ac:f7:d6:65:71:7f:49:78:b5:d2: + 20:13:47:59:8c:f1:b4:3e:4e:dc:7f:3a:59:cf:d5:ec:5e:57: + 1c:ea:88:f9:5c:57:5f:77:4f:c4:03:07:d2:89:f8:ee:f7:b3: + 6d:ba:80:c0:07:f7:19:25:68:76:cc:90:6a:91:a6:dc:57:b6: + 3f:81:74:58:9a:52:0b:9e:07:74:da:2c:bd:e8:e1:7d:25:bc: + b7:c3:60:7e:01:bb:1d:fe:4f:f7:81:26:d5:b3:25:83:45:b9: + 26:8b:e5:45:71:96:1d:d5:f2:64:fb:a6:18:8c:08:c7:ad:b9: + 5f:33:9b:fb:21:d7:96:3b:18:06:bc:3b:c4:4e:d6:b9:cd:33: + 28:44:1a:4a:37:a6:83:d0:9c:e4:f3:44:6c:28:44:13:6f:7a: + 21:52:5b:4f:4a:52:2f:b0:2b:bc:25:88:3f:15:69:94:2d:3c: + fe:27:af:5d:d3:c1:a6:56:fa:86:26:b5:15:c3:e8:dc:f6:38: + 7a:ce:4a:94:78:1b:d2:e2:a1:a6:7f:fd:7a:55:a1:bd:39:75: + 5f:ac:1a:9a:07:81:04:69:95:68:e5:bd:78:6b:e8:c0:03:f8: + 81:f8:6d:a4:6d:31:54:34:7b:90:b3:f4:4a:80:e1:14:ac:aa: + d9:e2:29:64:14:39:0e:7c:8a:86:7b:58:61:c1:04:f2:d2:06: + 5c:cb:e2:86:b6:68:ab:f5:4c:8c:5c:b6:54:d9:a6:d5:a7:a0: + 6a:1c:bd:c0:bf:2c:66:ff:30:0a:3b:59:ac:b6:06:65:13:10: + e5:01:70:4e:c9:b3:5c:3d:18:44:f3:62:b1:01:69:82:5e:63: + a2:51:19:14:26:47:a3:39:d8:85:dd:10:90:b9:01:55:48:88: + 53:97:84:d3:d9:22:8e:11:3d:1b:e7:72:ac:35:8c:83:9b:7d: + 34:21:6c:81:ae:d0:39:a5:ec:22:12:0d:3b:e1:5b:5e:9a:5e: + 3c:77:8b:cf:18:ef:ff:ee:6a:92:ee:82:d6:0e:7e:e5:84:04: + da:e7:ba:33:33:2d:b6:12:73:b7:75:7b:aa:27:c4:00:38:8c: + 5a:6e:4a:0c:28:78:6b:24:a6:a9:77:d8:5d:f9:11:71:bc:80: + 60:52:95:44:51:8b:ee:ab:8d:68:de:1e:86:e9:12:8d:6c:71: + 77:d2:75:f4:c4:12:65:36:d3:4f:49:0f:1f:7b:ab:06:b5:f9: + 7a:90:1e:c9:c6:a4:67:ac:80:d8:c2:cd:b1:c4:28:3f:15:fb: + fc:f4:73:70:92:02:84:63:f6:29:92:93:72:04:70:ee:b6:67: + 44:0f:f3:f0:19:58:37:22 -----BEGIN CERTIFICATE----- -MIIJgjCCB2qgAwIBAgIBDzANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJHQjEQ +MIIJ3TCCB8WgAwIBAgIBFjANBgkqhkiG9w0BAQsFADBXMQswCQYDVQQGEwJHQjEQ MA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMRUwEwYDVQQKDAxVYnVu -dHUgQ2xvdWQxDjAMBgNVBAsMBUNsb3VkMB4XDTIxMDIxMTEyNDkxMVoXDTIyMDIx -MTEyNDkxMVowbDELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxDzANBgNV +dHUgQ2xvdWQxDjAMBgNVBAsMBUNsb3VkMB4XDTIyMDYzMDEzMzAxMloXDTIzMDYz +MDEzMzAxMlowbTELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxDzANBgNV BAcMBkxvbmRvbjEVMBMGA1UECgwMVWJ1bnR1IENsb3VkMQ4wDAYDVQQLDAVDbG91 -ZDETMBEGA1UEAwwKMTAuMC4xLjIxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAMTk7BpkwewVBXJHgu7GsRKivq/xUtnll1I1Ebd22lNUmWCHKNTEVXDE -WsMSLGKa3smSMKRFVoMIYm4Y3+vq68NEF/5q3MT2mL4QerT1TZpgL2zRQOmmV3n2 -wV9+mcSGEqLwelAIIB6jQndx+i9HiyYwkcv6VTj6dv4VT+zZ299EPOEihJ9uy3XS -Dh2TwFqDuugT548T2eW8UgTZ6mhi5Z0AEULvcFT5aQLj90ZrNc4smoCTejelTpLx -uUpHE/B5IYJ1hnuRymPXYCNmJjXJgVvRGXSg6elyxfsYVfWh/4lpBLE2gfVboR23 -bMJ0yQRQpMHdvhRq68z2F1r7lTlTRnECAwEAAaOCBUIwggU+MB0GA1UdDgQWBBTL -m2fBazCTE/yKu7DK7c709qKVZTAfBgNVHSMEGDAWgBQxlXLrBmkNIZZj3jWucFLs -g7zXVDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDCCBLQGA1UdEQSCBKswggSnhwQK -AAHThwQKAAHUhwQKAAHVhwQKAAHWhwQKAAHXhwQKAAHYhwQKAAHZhwQKAAHahwQK -AAHbhwQKAAHchwQKAAHdhwQKAAHehwQKAAHfhwQKAAHghwQKAAHhhwQKAAHihwQK -AAHjhwQKAAHkhwQKAAHlhwQKAAHmghtnbGFuY2UtaW50ZXJuYWwuZXhhbXBsZS5j -b22CGWdsYW5jZS1wdWJsaWMuZXhhbXBsZS5jb22CEmdsYW5jZS5leGFtcGxlLmNv -bYIbY2luZGVyLWludGVybmFsLmV4YW1wbGUuY29tghljaW5kZXItcHVibGljLmV4 -YW1wbGUuY29tghJjaW5kZXIuZXhhbXBsZS5jb22CGW5vdmEtaW50ZXJuYWwuZXhh -bXBsZS5jb22CF25vdmEtcHVibGljLmV4YW1wbGUuY29tghBub3ZhLmV4YW1wbGUu -Y29tgh1rZXlzdG9uZS1pbnRlcm5hbC5leGFtcGxlLmNvbYIba2V5c3RvbmUtcHVi -bGljLmV4YW1wbGUuY29tghRrZXlzdG9uZS5leGFtcGxlLmNvbYIcbmV1dHJvbi1p -bnRlcm5hbC5leGFtcGxlLmNvbYIabmV1dHJvbi1wdWJsaWMuZXhhbXBsZS5jb22C -E25ldXRyb24uZXhhbXBsZS5jb22CHGhvcml6b24taW50ZXJuYWwuZXhhbXBsZS5j -b22CGmhvcml6b24tcHVibGljLmV4YW1wbGUuY29tghNob3Jpem9uLmV4YW1wbGUu -Y29tghpzd2lmdC1pbnRlcm5hbC5leGFtcGxlLmNvbYIYc3dpZnQtcHVibGljLmV4 -YW1wbGUuY29tghFzd2lmdC5leGFtcGxlLmNvbYIZaGVhdC1pbnRlcm5hbC5leGFt -cGxlLmNvbYIXaGVhdC1wdWJsaWMuZXhhbXBsZS5jb22CEGhlYXQuZXhhbXBsZS5j -b22CGWFvZGgtaW50ZXJuYWwuZXhhbXBsZS5jb22CF2FvZGgtcHVibGljLmV4YW1w -bGUuY29tghBhb2RoLmV4YW1wbGUuY29tgh9jZWlsb21ldGVyLWludGVybmFsLmV4 -YW1wbGUuY29tgh1jZWlsb21ldGVyLXB1YmxpYy5leGFtcGxlLmNvbYIWY2VpbG9t -ZXRlci5leGFtcGxlLmNvbYIcZ25vY2NoaS1pbnRlcm5hbC5leGFtcGxlLmNvbYIa -Z25vY2NoaS1wdWJsaWMuZXhhbXBsZS5jb22CE2dub2NjaGkuZXhhbXBsZS5jb22C -G25hZ2lvcy1pbnRlcm5hbC5leGFtcGxlLmNvbYIZbmFnaW9zLXB1YmxpYy5leGFt -cGxlLmNvbYISbmFnaW9zLmV4YW1wbGUuY29tghV2YXVsdC1pbnQuZXhhbXBsZS5j -b22CGHZhdWx0LXB1YmxpYy5leGFtcGxlLmNvbYIRdmF1bHQuZXhhbXBsZS5jb22C -HmxhbmRzY2FwZS1pbnRlcm5hbC5leGFtcGxlLmNvbYIcbGFuZHNjYXBlLXB1Ymxp -Yy5leGFtcGxlLmNvbYIVbGFuZHNjYXBlLmV4YW1wbGUuY29tMCwGCWCGSAGG+EIB -DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQsF -AAOCAgEAJE/6IzhwR8pnp7PfYNTU6fEvg8qUQc1gwjHK2gwbMkCNrL0F9ik5/aN3 -EnaNUI294PaD1B/6lvF1VjNWe5+mwcVaDij+SbC6WlZLr77Bao14NZDTxWmRGWEM -DF/dzHcLb1EQ/gbMDvTCZcYLYS2ViN+nmtKb3ZYE93dB4iram6Ezqt7qVrt42eXd -cYhXstHoi3Xa+NycigulVSijStGjxAZOtI7hRBFLBFoHNyYMK6UDu/YVj/PkD6Aq -uPfETecD33xYDspnKjRLWzOytiaIIDSHzfvlJ39kiNXz6GxyIAX7vKENt9MDIIX7 -iO/OoM2ONdkUO0i+XEaPE71TBJNR0KenRMKBnP9w6p8HczHlSuGtLFNmRDQe4FBy -rShnAC+GyBEjqKEg0LBRRCvrRmF//UMp2tDxjNGy2Gw0efi5d4lYMLYA3gVelPDE -2AXA86nUz4/zSordjLwRhq7T7OOa6hNq2y/SU4Q7ucWYI9m2TfXDMh9qOYDEZrlD -npo5fQgS7IfLONFMkwzO0LIO26YAopnAEQaBqRy/2Ix7wnE9GRphyd3s+UT/FToa -H9WVVWPusjUBgYOJshqnjVsRvgH8O1R2zjtvrmz8sSR3nk8aggIgDsUkxFw/Ix7+ -snibDrGRTmAPJuqQXQm8tKup5Porw9Ns1TB65PLrxuf79Nxc4zg= +ZDEUMBIGA1UEAwwLMTAuMC4xLjIxMX0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQCXgBJ+duvrGAcRiRwEvWt5YbB+UTjVf0oLS0rj4LVekUzwvJlypkNx +WWSQb5dC0EeM4Wf9tzHr9ijvhGA5BGWCcR8bVAoYbr+ZdV6el3SJB7x74BojtjfE +EtDABfH5qSPu+UmocKowOj2SsK0Po0V0VvyT3tPeoM+bIjZrYcl6KzwUID/k/rhn +cwamhaHfkq27WEABpaZhL/Pv6c7QA7n6aExbCrPy6WTDbAmaQ249r1vJYqUOkfRc +P2MxcrvVaIt3OgFK9MWp3Mg87lrqwejKo9wOkILgT9FGnNiY4qCJrEB4RZ4t+l/Z +fgq1IhAHy+1qoIxLHUm0XfV/GQ+z37UJAgMBAAGjggWcMIIFmDAdBgNVHQ4EFgQU +y7KYSsJ3CxF0+7vDq/pl/+Y7PwUwHwYDVR0jBBgwFoAUa2UDOt0MrUX4/ZKsVEhL +dKWZ8QUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwggUOBgNVHREEggUFMIIFAYcE +CgAB04cECgAB1IcECgAB1YcECgAB1ocECgAB14cECgAB2IcECgAB2YcECgAB2ocE +CgAB24cECgAB3IcECgAB3YcECgAB3ocECgAB34cECgAB4IcECgAB4YcECgAB4ocE +CgAB44cECgAB5IcECgAB5YcECgAB5oIbZ2xhbmNlLWludGVybmFsLmV4YW1wbGUu +Y29tghlnbGFuY2UtcHVibGljLmV4YW1wbGUuY29tghJnbGFuY2UuZXhhbXBsZS5j +b22CG2NpbmRlci1pbnRlcm5hbC5leGFtcGxlLmNvbYIZY2luZGVyLXB1YmxpYy5l +eGFtcGxlLmNvbYISY2luZGVyLmV4YW1wbGUuY29tghlub3ZhLWludGVybmFsLmV4 +YW1wbGUuY29tghdub3ZhLXB1YmxpYy5leGFtcGxlLmNvbYIQbm92YS5leGFtcGxl +LmNvbYIda2V5c3RvbmUtaW50ZXJuYWwuZXhhbXBsZS5jb22CG2tleXN0b25lLXB1 +YmxpYy5leGFtcGxlLmNvbYIUa2V5c3RvbmUuZXhhbXBsZS5jb22CHG5ldXRyb24t +aW50ZXJuYWwuZXhhbXBsZS5jb22CGm5ldXRyb24tcHVibGljLmV4YW1wbGUuY29t +ghNuZXV0cm9uLmV4YW1wbGUuY29tghxob3Jpem9uLWludGVybmFsLmV4YW1wbGUu +Y29tghpob3Jpem9uLXB1YmxpYy5leGFtcGxlLmNvbYITaG9yaXpvbi5leGFtcGxl +LmNvbYIac3dpZnQtaW50ZXJuYWwuZXhhbXBsZS5jb22CGHN3aWZ0LXB1YmxpYy5l +eGFtcGxlLmNvbYIRc3dpZnQuZXhhbXBsZS5jb22CGWhlYXQtaW50ZXJuYWwuZXhh +bXBsZS5jb22CF2hlYXQtcHVibGljLmV4YW1wbGUuY29tghBoZWF0LmV4YW1wbGUu +Y29tghlhb2RoLWludGVybmFsLmV4YW1wbGUuY29tghdhb2RoLXB1YmxpYy5leGFt +cGxlLmNvbYIQYW9kaC5leGFtcGxlLmNvbYIfY2VpbG9tZXRlci1pbnRlcm5hbC5l +eGFtcGxlLmNvbYIdY2VpbG9tZXRlci1wdWJsaWMuZXhhbXBsZS5jb22CFmNlaWxv +bWV0ZXIuZXhhbXBsZS5jb22CHGdub2NjaGktaW50ZXJuYWwuZXhhbXBsZS5jb22C +Gmdub2NjaGktcHVibGljLmV4YW1wbGUuY29tghNnbm9jY2hpLmV4YW1wbGUuY29t +ghtuYWdpb3MtaW50ZXJuYWwuZXhhbXBsZS5jb22CGW5hZ2lvcy1wdWJsaWMuZXhh +bXBsZS5jb22CEm5hZ2lvcy5leGFtcGxlLmNvbYIadmF1bHQtaW50ZXJuYWwuZXhh +bXBsZS5jb22CGHZhdWx0LXB1YmxpYy5leGFtcGxlLmNvbYIRdmF1bHQuZXhhbXBs +ZS5jb22CHmxhbmRzY2FwZS1pbnRlcm5hbC5leGFtcGxlLmNvbYIcbGFuZHNjYXBl +LXB1YmxpYy5leGFtcGxlLmNvbYIVbGFuZHNjYXBlLmV4YW1wbGUuY29tgh5wbGFj +ZW1lbnQtaW50ZXJuYWwuZXhhbXBsZS5jb22CHHBsYWNlbWVudC1wdWJsaWMuZXhh +bXBsZS5jb22CFXBsYWNlbWVudC5leGFtcGxlLmNvbTAsBglghkgBhvhCAQ0EHxYd +T3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwDQYJKoZIhvcNAQELBQADggIB +AJgjm0+QlBpurPfWZXF/SXi10iATR1mM8bQ+Ttx/OlnP1exeVxzqiPlcV193T8QD +B9KJ+O73s226gMAH9xklaHbMkGqRptxXtj+BdFiaUgueB3TaLL3o4X0lvLfDYH4B +ux3+T/eBJtWzJYNFuSaL5UVxlh3V8mT7phiMCMetuV8zm/sh15Y7GAa8O8RO1rnN +MyhEGko3poPQnOTzRGwoRBNveiFSW09KUi+wK7wliD8VaZQtPP4nr13TwaZW+oYm +tRXD6Nz2OHrOSpR4G9LioaZ//XpVob05dV+sGpoHgQRplWjlvXhr6MAD+IH4baRt +MVQ0e5Cz9EqA4RSsqtniKWQUOQ58ioZ7WGHBBPLSBlzL4oa2aKv1TIxctlTZptWn +oGocvcC/LGb/MAo7Way2BmUTEOUBcE7Js1w9GETzYrEBaYJeY6JRGRQmR6M52IXd +EJC5AVVIiFOXhNPZIo4RPRvncqw1jIObfTQhbIGu0Dml7CISDTvhW16aXjx3i88Y +7//uapLugtYOfuWEBNrnujMzLbYSc7d1e6onxAA4jFpuSgwoeGskpql32F35EXG8 +gGBSlURRi+6rjWjeHobpEo1scXfSdfTEEmU2009JDx97qwa1+XqQHsnGpGesgNjC +zbHEKD8V+/z0c3CSAoRj9imSk3IEcO62Z0QP8/AZWDci -----END CERTIFICATE----- diff --git a/config/ssl/serverkey.pem b/config/ssl/serverkey.pem index ec00053..139ace3 100644 --- a/config/ssl/serverkey.pem +++ b/config/ssl/serverkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDE5OwaZMHsFQVy -R4LuxrESor6v8VLZ5ZdSNRG3dtpTVJlghyjUxFVwxFrDEiximt7JkjCkRVaDCGJu -GN/r6uvDRBf+atzE9pi+EHq09U2aYC9s0UDppld59sFffpnEhhKi8HpQCCAeo0J3 -cfovR4smMJHL+lU4+nb+FU/s2dvfRDzhIoSfbst10g4dk8Bag7roE+ePE9nlvFIE -2epoYuWdABFC73BU+WkC4/dGazXOLJqAk3o3pU6S8blKRxPweSGCdYZ7kcpj12Aj -ZiY1yYFb0Rl0oOnpcsX7GFX1of+JaQSxNoH1W6Edt2zCdMkEUKTB3b4UauvM9hda -+5U5U0ZxAgMBAAECggEAZJWuKC2hA8IZbjAqK2FFxIdvcuKNuNMZYt3JlzgYgMmP -MUjbCxbhryIgW9dE5XrIpaERSFpDv9zgq+35NsRkfPSkbUyaS+TOUwqIJTnL0zmg -AK9FwhdASQZN80LxuvvjOWowkgIUppIwumR3sv+RjojxcosITntlnpe0pQMG2B9W -stEcU+N7jnWtZ9srY5y8ofxGNZ/ro25upFLHI/eE8tlTvWpSOdXS7vFvpa9VhVzo -ZwjcqpIAuW+JwRqeqshDGlgECsaPaAtX/+txIrHDFZCRXAB/GT2y9rpPEH/zjVT8 -TMmaxIanJcxWegdrvq1ZX+eS7luR9FwQfib08VkaIQKBgQDjOKeW6ewUu8CdKIxb -ZC4VYx9sfQsGDsoBDFMU/nGQSYnZT5kQoAL/98ixXiCunmuAkNfl1Uhk1i8zVsvL -lrA57D2KHnrbvCyY97VFFKGwZG6Z5XYRPkgzluR4+eycTkgCXNIgSeYOsGiEvHdl -MZASN7A+coVXO/bt7fUiiJvWDwKBgQDd1PPuV/tY0JHPLdoqEGRysjbpKdggN2Wr -LT6/do3czSTPmkmXhiqdH98H02DkX//hM3Bu+4uAAgDU+pro4gU8OjGi6Rb6Cxwg -k9asyBGRK5jD2iYNI9HXirMtN8ktDetpNJlriFYaIY1UP0ME9jkUHuB2ePwmZfKV -rmvI0QebfwKBgE0Tj83iheG2mqz07z+lKPi6ShOMCyw/4gge/SPW+ADg4TDlDmAU -V1Aq5lo8OsvhE0hmWcYt5kPGX/aDT9g8woSzfWCX3EcjeuFczZGkYQCr4NS1gKpy -vR065z+eT8PpzgV3JRQs3SxIbPvxznJ2MI/tcgyM3mxr++RT3t6bBnnDAoGAbwFw -a3W1fjUosc8VG/WF/ms11SmuUDjIdIc4niDaToKNiCGB8AQgcO4Q8l6RXta3Od8+ -xRq1LQJTnkAloqHv0rqgOhCAAfHrSlYQl/ep6sYxNNiGMA8bo8txbBA9aIFNqyC6 -IThhNcRSb7UUeXgpCeuFkWNrcl+Tq9lTcHNBZksCgYByy+cEi3OBrmPT0K24f7gv -0w249LbB0p4syQ2sC8uDhiz6NdFcB+7YvlZdCVAiSaO4X8AvnL6d1rGcAByS/wOF -Q79YMHq82iYtJnvGDrlgFoKHSYhUcmdN5idBLVWKm281NVIQKJMTlCMjvDdTOCKh -wnpnmlCJWeyRkanwX11K2A== +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCXgBJ+duvrGAcR +iRwEvWt5YbB+UTjVf0oLS0rj4LVekUzwvJlypkNxWWSQb5dC0EeM4Wf9tzHr9ijv +hGA5BGWCcR8bVAoYbr+ZdV6el3SJB7x74BojtjfEEtDABfH5qSPu+UmocKowOj2S +sK0Po0V0VvyT3tPeoM+bIjZrYcl6KzwUID/k/rhncwamhaHfkq27WEABpaZhL/Pv +6c7QA7n6aExbCrPy6WTDbAmaQ249r1vJYqUOkfRcP2MxcrvVaIt3OgFK9MWp3Mg8 +7lrqwejKo9wOkILgT9FGnNiY4qCJrEB4RZ4t+l/Zfgq1IhAHy+1qoIxLHUm0XfV/ +GQ+z37UJAgMBAAECggEAILR7aZUbE1aNyhWO+J/6mErEOtSmYAJ5VcxUd7Kd/LMB +yNNyDcvCMfFCEiMg5IHJfGp5lE4spvtuNVyemBhwoHLyq+fdwQ4Bayuo+DQKan2C +zTwg8HYo/jkwms99v+9pTDDBG61ss/oSqjzdM0vEFdwkbPiUxNHy11LQrChBQg/H +s09XNZ4TPnkTtZMvJOaXWre4Qov8AkFvIhQunXllwpkazsm1M+OohPlFaNHu+ZaW +kKH+LJQDkw9jHLn/3CKmsdEFTfSnE7VSgOnOKO5dUj2dQfaCetfrKeXveNRvVfi2 +/uVZP0v3AVqC6dkZIgj60DjI4QdPsdVHdYOPMPgTjQKBgQC9vDCssBTy6aUzPBpo +121RPAAReZFdMfD/w/JTThjOEhex7lHZwFJGzA15tEVCnHqg+vMhMOtNIvf5Lch1 +5a7iXErZeKYvic9yr6amqLTndkKP31k/znAfCexLV4vGyA7Alg/uFROctIErnr83 +Vy/2p1B75ZGAOnI2TWTGLkjh5QKBgQDMaWMyEygjNAjyd9MPYEyfT61RZlwaWdsF +5TOVzi2BhiTsmEtAqpsy9n21tdPVGag1J5G9g7CFaZDEYchvgbV+KGypvywslL84 +R4PEsVw3BPRO9MBcx9T5l66M1ZGQqORx9ASMiwDJPuYvUU1rB1zLGedFYH+p/SBb +SIDYOb6kVQKBgQC2wsfAD/yd4CGZMJPf2WMblMgcDRXQx4J1W7HYPKn4FcVtRzrg +nTijqXpxeQweFcyptBDuL8j4DG8APvGRXyUONgiDYovxzrVcq4XDk05uhqOnImU9 +6QRnYY+TI0kouRw8tk+x7etuTxD9i3R1Qi6ZUKFeNsvo0GOjmvkvTPY3YQKBgQCS +Pee5AJmbrfOkvPNkMco/w/pEnU3RkG2xJwyj5ZEK9JTgLAjSp/xHFrBTW1XFRQjh +loCfLGMS37axuR90H0Fgk71CKEKLVpQDyK5N/3Hw7vt2rYYeGt2U/97iZT0yWJKv +sBu9DQmv8O8v9SPFKcxKhiq+qM5NKIqIpDOB/rYUzQKBgQClw4/RTPlNF+Nn3T0P +vmL+Ukb8E1RITjBqUZfaJDYYW0IyeRaRaA5Boh8mhlsejrgXeVJss/YxGp13zDY7 +3yx1Pjuy8hJkAbeVRlULRRTSyCzPGeRpp/sif+Vv/NFqnIgfzNDdpVvbuxnaRDBz +mQZJp9NNm46hpokYQ0UJZK6FhQ== -----END PRIVATE KEY----- diff --git a/scripts/arif-scripts/do_landscape_tags.sh b/scripts/arif-scripts/do_landscape_tags.sh index 91700c5..83416e6 100755 --- a/scripts/arif-scripts/do_landscape_tags.sh +++ b/scripts/arif-scripts/do_landscape_tags.sh @@ -2,24 +2,39 @@ . landscape_rc -juju_machines=$(mktemp) +juju_status=$(mktemp) +juju_models=$(mktemp) -juju machines > ${juju_machines} +juju models --format json > "${juju_models}" -for az in $(cat ${juju_machines} | awk '{print $6}' | tail +2 | sort | uniq) -do - for host in $(cat ${juju_machines} | grep ${az} | awk '{print $4}') - do - landscape-api add-tags-to-computers title:${host} "${az}" - landscape-api add-tags-to-computers title:${host} "asrock" - done +models=$(jq -r .models[].\"short-name\" "${juju_models}") + +for model in ${models} ; do + + juju status -m "${model}" --format json > "${juju_status}" + + for phys_mach in $(jq -rc ".machines | keys[]" "${juju_status}") ; do + + az=$(jq -rc ".machines.\"${phys_mach}\".hardware" "${juju_status}" | sed 's/.*availability-zone=//g') + hostname=$(jq -r ".machines.\"${phys_mach}\".hostname" "${juju_status}") + + landscape-api add-tags-to-computers title:"${hostname}" "${az}" + landscape-api add-tags-to-computers title:"${hostname}" "${model}-model" + + containers=$(jq -rc ".machines.\"${phys_mach}\" | (select(.containers != null ) | .containers | to_entries[] | .value.hostname)" "${juju_status}") + + for container in ${containers} + do + + landscape-api add-tags-to-computers title:"${container}" "${az}" + landscape-api add-tags-to-computers title:"${container}" "${model}-model" + if [[ "${container}" == *"lxd"* ]] ; then + landscape-api add-tags-to-computers title:"${container}" lxd + fi + if [[ "${container}" == *"kvm"* ]] ; then + landscape-api add-tags-to-computers title:"${container}" kvm + fi + + done + done done - -landscape-api add-tags-to-computers "lxd-" "lxd" -landscape-api add-tags-to-computers "kvm-" "kvm" -landscape-api add-tags-to-computers title:asrock01 "asrock01" -landscape-api add-tags-to-computers title:asrock02 "asrock02" -landscape-api add-tags-to-computers title:asrock03 "asrock03" -landscape-api add-tags-to-computers title:asrock01 "physical" -landscape-api add-tags-to-computers title:asrock02 "physical" -landscape-api add-tags-to-computers title:asrock03 "physical" diff --git a/scripts/arif-scripts/update_landscape_certs_self.sh b/scripts/arif-scripts/update_landscape_certs_self.sh index 6ba5fed..7cc7aca 100755 --- a/scripts/arif-scripts/update_landscape_certs_self.sh +++ b/scripts/arif-scripts/update_landscape_certs_self.sh @@ -17,8 +17,8 @@ for client in ${clients} ; do juju config ${client} --reset ssl-public-key,url,ping-url juju config ${client} ssl-public-key="base64:${landscape_crt}" \ - url="https://${landscape_ip}/message-system" \ - ping-url="http://${landscape_ip}/ping" + url="https://landscape.example.com/message-system" \ + ping-url="http://landscape.example.com/ping" juju run -a ${client} 'sudo systemctl restart landscape-client.service' done @@ -32,8 +32,8 @@ do juju config -m ${model} ${client} --reset ssl-public-key,url,ping-url juju config -m ${model} ${client} ssl-public-key="base64:${landscape_crt}" \ - url="https://${landscape_ip}/message-system" \ - ping-url="http://${landscape_ip}/ping" + url="https://landscape.example.com/message-system" \ + ping-url="http://landscape.example.com/ping" juju run -m ${model} -a ${client} 'sudo systemctl restart landscape-client.service' done