Dingo stack

.ansible-lint

@@ -1,4 +1,5 @@
 ---
+strict: true
 use_default_rules: true
 skip_list:
   # [E301] Commands should not change things if nothing needs doing

.gitreview

@@ -2,3 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kolla-ansible.git
+defaultbranch=stable/2023.2

README.rst

@@ -57,7 +57,7 @@ Kolla Ansible deploys containers for the following OpenStack projects:
 - `Kuryr <https://docs.openstack.org/kuryr/latest/>`__
 - `Magnum <https://docs.openstack.org/magnum/latest/>`__
 - `Manila <https://docs.openstack.org/manila/latest/>`__
-- `Masakari <https://docs.openstack.org/masakari/latest/>`__ (deprecated)
+- `Masakari <https://docs.openstack.org/masakari/latest/>`__
 - `Mistral <https://docs.openstack.org/mistral/latest/>`__
 - `Murano <https://docs.openstack.org/murano/latest/>`__
 - `Neutron <https://docs.openstack.org/neutron/latest/>`__

ansible/gather-facts.yml

@@ -4,28 +4,21 @@
 # building their configurations.
 - name: Gather facts for all hosts
   hosts: all
-  any_errors_fatal: "{{ kolla_ansible_setup_any_errors_fatal | bool }}"
   serial: '{{ kolla_serial|default("0") }}'
   gather_facts: false
   tasks:
+    - name: Group hosts to determine when using --limit
+      group_by:
+        key: "all_using_limit_{{ (ansible_play_batch | length) != (groups['all'] | length) }}"
+      changed_when: false
+
     - name: Gather facts
       setup:
         filter: "{{ kolla_ansible_setup_filter }}"
         gather_subset: "{{ kolla_ansible_setup_gather_subset }}"
       when:
+        # Don't gather if fact caching is in use
         - not ansible_facts
-
-    - name: Gather package facts
-      package_facts:
-      when:
-        - "'packages' not in ansible_facts"
-        - kolla_action is defined
-        - kolla_action == "precheck"
-
-    - name: Group hosts to determine when using --limit
-      group_by:
-        key: "all_using_limit_{{ (ansible_play_batch | length) != (groups['all'] | length) }}"
-      changed_when: false
   tags: always
 
 # NOTE(pbourke): This case covers deploying subsets of hosts using --limit. The
@@ -36,7 +29,6 @@
 # the limit.
 - name: Gather facts for all hosts (if using --limit)
   hosts: all_using_limit_True
-  any_errors_fatal: "{{ kolla_ansible_setup_any_errors_fatal | bool }}"
   serial: '{{ kolla_serial|default("0") }}'
   gather_facts: false
   vars:
@@ -53,17 +45,10 @@
       delegate_facts: True
       delegate_to: "{{ item }}"
       with_items: "{{ delegate_hosts }}"
-      # We gathered facts for all hosts in the batch during the first play.
       when:
+        # We gathered facts for all hosts in the batch during the first play.
+        # Ensure that we don't try again if they failed.
+        - item not in groups["all_using_limit_True"]
+        # Don't gather if fact caching is in use
         - not hostvars[item].ansible_facts
-
-    - name: Gather package facts
-      package_facts:
-      delegate_facts: True
-      delegate_to: "{{ item }}"
-      with_items: "{{ delegate_hosts }}"
-      when:
-        - "'packages' not in hostvars[item].ansible_facts"
-        - kolla_action is defined
-        - "kolla_action == 'precheck'"
   tags: always

ansible/group_vars/all.yml

@@ -36,14 +36,6 @@ kolla_ansible_setup_filter: "{{ omit }}"
 # By default, we do not provide a gather subset.
 kolla_ansible_setup_gather_subset: "{{ omit }}"
 
-# This variable is used as "any_errors_fatal" setting for the setup (gather
-# facts) plays.
-# This is useful for weeding out failing hosts early to avoid late failures
-# due to missing facts (especially cross-host).
-# Do note this still supports host fact caching and it will not affect
-# scenarios with all facts cached (as there is no task to fail).
-kolla_ansible_setup_any_errors_fatal: false
-
 ###################
 # Kolla options
 ###################
@@ -56,7 +48,7 @@ kolla_base_distro: "rocky"
 kolla_internal_vip_address: "{{ kolla_internal_address | default('') }}"
 kolla_internal_fqdn: "{{ kolla_internal_vip_address }}"
 kolla_external_vip_address: "{{ kolla_internal_vip_address }}"
-kolla_same_external_internal_vip: "{{ kolla_external_vip_address == kolla_internal_vip_address }}"
+kolla_same_external_internal_vip: "{{ kolla_external_vip_address | ansible.utils.ipaddr('address') == kolla_internal_vip_address | ansible.utils.ipaddr('address') }}"
 kolla_external_fqdn: "{{ kolla_internal_fqdn if kolla_same_external_internal_vip | bool else kolla_external_vip_address }}"
 
 kolla_dev_repos_directory: "/opt/stack/"
@@ -443,6 +435,7 @@ ironic_http_port: "8089"
 ironic_prometheus_exporter_port: "9608"
 
 iscsi_port: "3260"
+kafka_port: "9092"
 
 keystone_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else keystone_public_listen_port }}"
 keystone_public_listen_port: "5000"
@@ -467,6 +460,12 @@ manila_api_port: "8786"
 manila_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else manila_api_port }}"
 manila_api_listen_port: "{{ manila_api_port }}"
 
+manila_share_internal_fqdn: "{{ kolla_internal_fqdn }}"
+manila_share_external_fqdn: "{{ kolla_external_fqdn }}"
+manila_share_port: "2049"
+manila_share_public_port: "{{ manila_share_port }}"
+manila_share_listen_port: "2050"
+
 mariadb_port: "{{ database_port }}"
 mariadb_wsrep_port: "4567"
 mariadb_ist_port: "4568"
@@ -584,6 +583,8 @@ prometheus_memcached_exporter_port: "9150"
 prometheus_rabbitmq_exporter_port: "{{ rabbitmq_prometheus_port }}"
 # Default cadvisor port of 8080 already in use
 prometheus_cadvisor_port: "18080"
+# Default pushgateway port of 9091 already in use
+prometheus_pushgateway_port: "19091"
 prometheus_fluentd_integration_port: "24231"
 prometheus_libvirt_exporter_port: "9177"
 prometheus_etcd_integration_port: "{{ etcd_client_port }}"
@@ -643,6 +644,11 @@ skyline_console_port: "9999"
 skyline_console_listen_port: "{{ skyline_console_port }}"
 skyline_console_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else skyline_console_port }}"
 
+
+dingo_command_external_fqdn: "{{ kolla_external_fqdn }}"
+dingo_command_internal_fqdn: "{{ kolla_internal_fqdn }}"
+dingo_command_port: "8887"
+
 solum_application_deployment_internal_fqdn: "{{ kolla_internal_fqdn }}"
 solum_application_deployment_external_fqdn: "{{ kolla_external_fqdn }}"
 solum_application_deployment_port: "9777"
@@ -689,6 +695,10 @@ watcher_api_port: "9322"
 watcher_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else watcher_api_port }}"
 watcher_api_listen_port: "{{ watcher_api_port }}"
 
+zookeeper_client_port: "2181"
+zookeeper_peer_port: "2888"
+zookeeper_quorum_port: "3888"
+
 zun_api_port: "9517"
 zun_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else zun_api_port }}"
 zun_api_listen_port: "{{ zun_api_port }}"
@@ -718,7 +728,7 @@ external_api_firewalld_zone: "public"
 ####################
 # OpenStack options
 ####################
-openstack_release: "master"
+openstack_release: "2023.2"
 # Docker image tag used by default.
 openstack_tag: "{{ openstack_release }}-{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{{ openstack_tag_suffix }}"
 openstack_tag_suffix: ""
@@ -817,6 +827,7 @@ enable_horizon: "{{ enable_openstack_core | bool }}"
 enable_horizon_blazar: "{{ enable_blazar | bool }}"
 enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}"
 enable_horizon_designate: "{{ enable_designate | bool }}"
+enable_horizon_fwaas: "{{ enable_neutron_fwaas | bool }}"
 enable_horizon_freezer: "{{ enable_freezer | bool }}"
 enable_horizon_heat: "{{ enable_heat | bool }}"
 enable_horizon_ironic: "{{ enable_ironic | bool }}"
@@ -842,6 +853,7 @@ enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool
 enable_ironic_pxe_uefi: "no"
 enable_ironic_prometheus_exporter: "{{ enable_ironic | bool and enable_prometheus | bool }}"
 enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}"
+enable_kafka: "no"
 enable_kuryr: "no"
 enable_letsencrypt: "no"
 enable_magnum: "no"
@@ -862,6 +874,7 @@ enable_neutron_vpnaas: "no"
 enable_neutron_sriov: "no"
 enable_neutron_mlnx: "no"
 enable_neutron_dvr: "no"
+enable_neutron_fwaas: "no"
 enable_neutron_qos: "no"
 enable_neutron_agent_ha: "no"
 enable_neutron_bgp_dragent: "no"
@@ -873,12 +886,14 @@ enable_neutron_trunk: "no"
 enable_neutron_metering: "no"
 enable_neutron_infoblox_ipam_agent: "no"
 enable_neutron_port_forwarding: "no"
+enable_neutron_bm_gateway: "no"
 enable_nova_libvirt_container: "{{ nova_compute_virt_type in ['kvm', 'qemu'] }}"
 enable_nova_serialconsole_proxy: "no"
 enable_nova_ssh: "yes"
 enable_octavia: "no"
 enable_octavia_driver_agent: "{{ enable_octavia | bool and neutron_plugin_agent == 'ovn' }}"
 enable_octavia_jobboard: "{{ enable_octavia | bool and 'amphora' in octavia_provider_drivers }}"
+octavia_nova_enable_anti_affinity: "yes"
 enable_openvswitch: "{{ enable_neutron | bool and neutron_plugin_agent != 'linuxbridge' }}"
 enable_ovn: "{{ enable_neutron | bool and neutron_plugin_agent == 'ovn' }}"
 enable_ovs_dpdk: "no"
@@ -901,6 +916,7 @@ enable_trove_singletenant: "no"
 enable_venus: "no"
 enable_vitrage: "no"
 enable_watcher: "no"
+enable_zookeeper: "no"
 enable_zun: "no"
 
 ovs_datapath: "{{ 'netdev' if enable_ovs_dpdk | bool else 'system' }}"
@@ -992,6 +1008,7 @@ haproxy_single_external_frontend_public_port: "{{ '443' if kolla_enable_tls_exte
 ##################
 kolla_httpd_keep_alive: "60"
 kolla_httpd_timeout: "60"
+cloudkitty_httpd_timeout: "600"
 
 ######################
 # Backend TLS options
@@ -1019,6 +1036,10 @@ keystone_public_url: "{{ keystone_external_fqdn | kolla_url(public_protocol, key
 keystone_admin_user: "admin"
 keystone_admin_project: "admin"
 
+# Whether or not to apply changes to service user passwords when services are
+# reconfigured
+update_keystone_service_user_passwords: true
+
 default_project_domain_name: "Default"
 default_project_domain_id: "default"
 
@@ -1245,6 +1266,12 @@ ceph_gnocchi_keyring: "client.{{ ceph_gnocchi_user }}.keyring"
 ceph_manila_keyring: "client.{{ ceph_manila_user }}.keyring"
 ceph_nova_keyring: "{{ ceph_cinder_keyring }}"
 
+# ceph pools configuration
+manila_export_store_pool_name: "ganesha-nfs-data"
+manila_export_object_name: "ganesha-export-index"
+
+
+
 #####################
 # VMware support
 ######################
@@ -1281,22 +1308,25 @@ enable_prometheus_ceph_mgr_exporter: "no"
 enable_prometheus_openstack_exporter: "{{ enable_prometheus | bool }}"
 enable_prometheus_openstack_exporter_external: "no"
 enable_prometheus_elasticsearch_exporter: "{{ enable_prometheus | bool and enable_opensearch | bool }}"
+enable_prometheus_pushgateway: "{{ enable_prometheus | bool }}" 
 enable_prometheus_blackbox_exporter: "{{ enable_prometheus | bool }}"
 enable_prometheus_rabbitmq_exporter: "{{ enable_prometheus | bool and enable_rabbitmq | bool }}"
 enable_prometheus_libvirt_exporter: "{{ enable_prometheus | bool and enable_nova | bool and nova_compute_virt_type in ['kvm', 'qemu'] }}"
 enable_prometheus_etcd_integration: "{{ enable_prometheus | bool and enable_etcd | bool }}"
 enable_prometheus_msteams: "no"
 
 prometheus_alertmanager_user: "admin"
+prometheus_pushgateway_user: "admin" 
 prometheus_grafana_user: "grafana"
 prometheus_scrape_interval: "60s"
-prometheus_openstack_exporter_interval: "{{ prometheus_scrape_interval }}"
-prometheus_openstack_exporter_timeout: "45s"
+prometheus_openstack_exporter_interval: "600s"
+prometheus_openstack_exporter_timeout: "150s"
 prometheus_elasticsearch_exporter_interval: "{{ prometheus_scrape_interval }}"
+prometheus_pushgateway_interval: "60s" 
 prometheus_cmdline_extras:
 prometheus_ceph_mgr_exporter_endpoints: []
 prometheus_openstack_exporter_endpoint_type: "internal"
-prometheus_openstack_exporter_compute_api_version: "latest"
+prometheus_openstack_exporter_compute_api_version: "2.87"
 prometheus_libvirt_exporter_interval: "60s"
 prometheus_msteams_webhook_url:
 
@@ -1317,6 +1347,17 @@ influxdb_datadir_volume: "influxdb"
 
 influxdb_internal_endpoint: "{{ kolla_internal_fqdn | kolla_url(internal_protocol, influxdb_http_port) }}"
 
+
+#################
+# Kafka options
+#################
+kafka_datadir_volume: "kafka"
+
+# The number of brokers in a Kafka cluster. This is used for automatically
+# setting quantities such as topic replicas and it is not recommended to
+# change it unless you know what you are doing.
+kafka_broker_count: "{{ groups['kafka'] | length }}"
+
 #########################
 # Internal Image options
 #########################

ansible/inventory/all-in-one

@@ -642,6 +642,9 @@ monitoring
 [prometheus-elasticsearch-exporter:children]
 opensearch
 
+[prometheus-pushgateway:children]
+monitoring
+
 [prometheus-blackbox-exporter:children]
 monitoring
 

ansible/inventory/multinode

@@ -661,6 +661,9 @@ monitoring
 [prometheus-elasticsearch-exporter:children]
 opensearch
 
+[prometheus-pushgateway:children]
+monitoring
+
 [prometheus-blackbox-exporter:children]
 monitoring
 

ansible/library/kolla_container_facts.py

@@ -104,7 +104,7 @@ def use_podman(module, results):
     for container in containers:
         container.reload()
         container_name = container.attrs['Name']
-        if container_name not in names:
+        if names and container_name not in names:
             continue
         results['_containers'].append(container.attrs)
         results[container_name] = container.attrs

ansible/library/kolla_toolbox.py

@@ -181,7 +181,9 @@ def use_docker(module):
                        "ANSIBLE_LOAD_CALLBACK_PLUGINS": "True"}
         job = client.exec_create(kolla_toolbox, command_line,
                                  environment=environment, **kwargs)
-        json_output = client.exec_start(job)
+        json_output, error = client.exec_start(job, demux=True)
+        if error:
+            module.log(msg='Inner module stderr: %s' % error)
 
         try:
             output = json.loads(json_output)