Merge branch 'johng-victoria-tweaks' into 'wip/arcus/victoria-staging'

Pack rather than spread

See merge request !206

etc/kayobe/kolla.yml

@@ -84,7 +84,7 @@ kolla_docker_registry_password: "{{ secrets_scientific_openstack_docker_registry
 
 # Kolla OpenStack release version. This should be a Docker image tag.
 # Default is {{ openstack_release }}.
-kolla_openstack_release: victoria-20230126153959
+kolla_openstack_release: victoria-20230202152347
 
 # Docker tag applied to built container images. Default is
 # {{ kolla_openstack_release }}.

etc/kayobe/kolla/config/nova/nova-scheduler.conf

@@ -6,3 +6,8 @@ placement_aggregate_required_for_tenants = true
 [filter_scheduler]
 available_filters = nova.scheduler.filters.all_filters
 enabled_filters = AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,PciPassthroughFilter,NUMATopologyFilter,AggregateInstanceExtraSpecsFilter
+
+# be sure to pack VMs, when possible, to limit fragmentation
+ram_weight_multiplier = -100.0
+cpu_weight_multiplier = -10.0
+weight_classes = nova.scheduler.weights.ram.RAMWeigher,nova.scheduler.weights.cpu.CPUWeigher

etc/kayobe/kolla/globals.yml

@@ -80,8 +80,17 @@ prometheus_openstack_exporter_timeout: 80s
 
 # Check keystone and horizon are up, and cert is valid
 prometheus_blackbox_exporter_endpoints:
-  - "https://{{ public_net_fqdn }}/auth/login/"
-  - "https://{{ public_net_fqdn }}:5000/v3"
+  - "{% raw %}horizon:os_endpoint:{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}{% endraw %}"
+  - "{% raw %}keystone:os_endpoint:{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ keystone_public_port}}{% endraw %}"
+  - "{% raw %}cinder:os_endpoint:{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ cinder_api_port}}{% endraw %}"
+  - "{% raw %}glance:os_endpoint:{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ glance_api_port}}{% endraw %}"
+  - "{% raw %}ironic:os_endpoint:{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ ironic_api_port}}{% endraw %}"
+  - "{% raw %}neutron:os_endpoint:{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ neutron_server_port}}{% endraw %}"
+  - "{% raw %}nova:os_endpoint:{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ nova_api_port}}{% endraw %}"
+  - "{% raw %}placement:os_endpoint:{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ placement_api_port}}{% endraw %}"
+  - "gateway:icmp:{{ public_net_gateway }}"
+  - "{% raw %}vip:icmp:{{ kolla_external_fqdn }}{% endraw %}"
+  - "dns:icmp:8.8.8.8"
 
 # Reduce the kolla-ansible token expiry default from one day to one hour
 fernet_token_expiry: 3600