From 585900041cf5ca8c54c3cf855ecee3cb75e73eaf Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Mon, 27 Oct 2025 17:02:25 +0000 Subject: [PATCH 1/5] Update .gitreview for stable/2025.2 Change-Id: I8201a3626dbbf2760f67b4d1f550043ce30f4bb9 Signed-off-by: OpenStack Release Bot Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/functions --- .gitreview | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitreview b/.gitreview index 975ab6dbf..c02840dd1 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/puppet-openstack-integration.git +defaultbranch=stable/2025.2 From a85ed1c0f98b9af49746c363b96a271da6e0234d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 28 Oct 2025 11:11:32 +0900 Subject: [PATCH 2/5] Switch to stable/2025.2 Change-Id: Ia924fbe3319f1f269e346cf25f72fc4e85b275d8 Signed-off-by: Takashi Kajinami --- Puppetfile | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Puppetfile b/Puppetfile index 207bef249..af4923d78 100644 --- a/Puppetfile +++ b/Puppetfile @@ -3,15 +3,15 @@ ## OpenStack modules mod 'aodh', :git => 'https://opendev.org/openstack/puppet-aodh', - :ref => 'master' + :ref => 'stable/2025.2' mod 'barbican', :git => 'https://opendev.org/openstack/puppet-barbican', - :ref => 'master' + :ref => 'stable/2025.2' mod 'ceilometer', :git => 'https://opendev.org/openstack/puppet-ceilometer', - :ref => 'master' + :ref => 'stable/2025.2' mod 'ceph', :git => 'https://opendev.org/openstack/puppet-ceph', @@ -19,111 +19,111 @@ mod 'ceph', mod 'cinder', :git => 'https://opendev.org/openstack/puppet-cinder', - :ref => 'master' + :ref => 'stable/2025.2' mod 'cloudkitty', :git => 'https://opendev.org/openstack/puppet-cloudkitty', - :ref => 'master' + :ref => 'stable/2025.2' mod 'designate', :git => 'https://opendev.org/openstack/puppet-designate', - :ref => 'master' + :ref => 'stable/2025.2' mod 'glance', :git => 'https://opendev.org/openstack/puppet-glance', - :ref => 'master' + :ref => 'stable/2025.2' mod 'gnocchi', :git => 'https://opendev.org/openstack/puppet-gnocchi', - :ref => 'master' + :ref => 'stable/2025.2' mod 'heat', :git => 'https://opendev.org/openstack/puppet-heat', - :ref => 'master' + :ref => 'stable/2025.2' mod 'horizon', :git => 'https://opendev.org/openstack/puppet-horizon', - :ref => 'master' + :ref => 'stable/2025.2' mod 'ironic', :git => 'https://opendev.org/openstack/puppet-ironic', - :ref => 'master' + :ref => 'stable/2025.2' mod 'keystone', :git => 'https://opendev.org/openstack/puppet-keystone', - :ref => 'master' + :ref => 'stable/2025.2' mod 'magnum', :git => 'https://opendev.org/openstack/puppet-magnum', - :ref => 'master' + :ref => 'stable/2025.2' mod 'manila', :git => 'https://opendev.org/openstack/puppet-manila', - :ref => 'master' + :ref => 'stable/2025.2' mod 'mistral', :git => 'https://opendev.org/openstack/puppet-mistral', - :ref => 'master' + :ref => 'stable/2025.2' mod 'neutron', :git => 'https://opendev.org/openstack/puppet-neutron', - :ref => 'master' + :ref => 'stable/2025.2' mod 'nova', :git => 'https://opendev.org/openstack/puppet-nova', - :ref => 'master' + :ref => 'stable/2025.2' mod 'octavia', :git => 'https://opendev.org/openstack/puppet-octavia', - :ref => 'master' + :ref => 'stable/2025.2' mod 'openstack_extras', :git => 'https://opendev.org/openstack/puppet-openstack_extras', - :ref => 'master' + :ref => 'stable/2025.2' mod 'openstacklib', :git => 'https://opendev.org/openstack/puppet-openstacklib', - :ref => 'master' + :ref => 'stable/2025.2' mod 'oslo', :git => 'https://opendev.org/openstack/puppet-oslo', - :ref => 'master' + :ref => 'stable/2025.2' mod 'ovn', :git => 'https://opendev.org/openstack/puppet-ovn', - :ref => 'master' + :ref => 'stable/2025.2' mod 'placement', :git => 'https://opendev.org/openstack/puppet-placement', - :ref => 'master' + :ref => 'stable/2025.2' mod 'swift', :git => 'https://opendev.org/openstack/puppet-swift', - :ref => 'master' + :ref => 'stable/2025.2' mod 'tempest', :git => 'https://opendev.org/openstack/puppet-tempest', - :ref => 'master' + :ref => 'stable/2025.2' mod 'trove', :git => 'https://opendev.org/openstack/puppet-trove', - :ref => 'master' + :ref => 'stable/2025.2' mod 'vswitch', :git => 'https://opendev.org/openstack/puppet-vswitch', - :ref => 'master' + :ref => 'stable/2025.2' mod 'vitrage', :git => 'https://opendev.org/openstack/puppet-vitrage', - :ref => 'master' + :ref => 'stable/2025.2' mod 'watcher', :git => 'https://opendev.org/openstack/puppet-watcher', - :ref => 'master' + :ref => 'stable/2025.2' mod 'zaqar', :git => 'https://opendev.org/openstack/puppet-zaqar', - :ref => 'master' + :ref => 'stable/2025.2' ## External modules mod 'kmod', From 7dc4722383f315d244a937a4a3e9382e5561dd4b Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 14 Nov 2025 01:30:46 +0900 Subject: [PATCH 3/5] tempest: Cap share API version Due to pending migration to CentOS Stream 10 we are using old version of manila in CI. Cap the maximum API version to avoid failure caused by the newer (and unavailable) API version expected by manila-t-p. Change-Id: I9f9b905111d5d23cf4604fb58966a8f3e39b3183 Signed-off-by: Takashi Kajinami (cherry picked from commit 09ff119cd16f6a5c5ef2e3aa18eff6947ac70622) --- manifests/tempest.pp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/tempest.pp b/manifests/tempest.pp index 6197d2fd8..d8ac2315f 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -376,6 +376,8 @@ share_multitenancy_enabled => false, share_enable_protocols => [downcase($share_protocol)], share_capability_storage_protocol => $share_protocol, + # TODO(tkajinam): Remove this once we complete migration to c10s. + share_max_microversion => '2.89', designate_nameservers => ["${openstack_integration::config::ip_for_url}:5322"], metric_backends => $metric_backends, } From 8849789c563aca38bcf189037ef3c9c17a9600ac Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 25 Feb 2026 22:24:43 +0900 Subject: [PATCH 4/5] Install libffi package ... to fix the failure during installing fiddle. Also fix Redis idempotency. Change-Id: I90644b6f03208fb0e41f18bf53b89281af764aaf Signed-off-by: Takashi Kajinami Signed-off-by: Tobias Urdin (cherry picked from commit faeb9c58bfec2ffc53328e771be7fae89f32d70f) --- Puppetfile | 5 +++-- manifests/ssl_key.pp | 6 +++--- playbooks/prepare-node-common.yaml | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Puppetfile b/Puppetfile index af4923d78..50c171e4e 100644 --- a/Puppetfile +++ b/Puppetfile @@ -184,7 +184,7 @@ mod 'memcached', mod 'dns', :git => 'https://github.com/theforeman/puppet-dns', - :ref => '11.1.0' + :ref => '12.1.0' mod 'archive', :git => 'https://github.com/voxpupuli/puppet-archive', @@ -196,7 +196,8 @@ mod 'ssh_keygen', mod 'redis', :git => 'https://github.com/voxpupuli/puppet-redis', - :ref => 'v12.0.0' + # NOTE(tkajinam): Temporal bump to fix broken idempotency + :ref => '27a95724b0a9597bbd9a314a96ff47da7eaaac18' mod 'systemd', :git => 'https://github.com/voxpupuli/puppet-systemd', diff --git a/manifests/ssl_key.pp b/manifests/ssl_key.pp index e5a2474f2..e4de7e872 100644 --- a/manifests/ssl_key.pp +++ b/manifests/ssl_key.pp @@ -26,13 +26,13 @@ file { "/etc/${name}/ssl": ensure => directory, owner => $key_owner, - mode => '0775', + mode => '0750', selinux_ignore_defaults => true, } file { "/etc/${name}/ssl/private": ensure => directory, owner => $key_owner, - mode => '0755', + mode => '0750', require => File["/etc/${name}/ssl"], selinux_ignore_defaults => true, before => File[$_key_path], @@ -44,6 +44,6 @@ owner => $key_owner, source => "puppet:///modules/openstack_integration/ipv${openstack_integration::config::ip_version}.key", selinux_ignore_defaults => true, - mode => '0600', + mode => '0640', } } diff --git a/playbooks/prepare-node-common.yaml b/playbooks/prepare-node-common.yaml index 3f244f708..a83e6768d 100644 --- a/playbooks/prepare-node-common.yaml +++ b/playbooks/prepare-node-common.yaml @@ -51,6 +51,7 @@ - zlib-devel - langpacks-en - glibc-langpack-en + - libffi-devel when: - ansible_os_family == 'RedHat' @@ -82,6 +83,7 @@ - libaugeas-dev - pkg-config - zlib1g-dev + - libffi-dev - python3-pip - name: Install Ruby dependencies (Debian) @@ -97,4 +99,5 @@ - libxslt1-dev - ruby-dev - zlib1g-dev + - libffi-dev - python3-pip From 5408a1a233346e1d1e628bab6065e23248290591 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 9 May 2026 01:59:55 +0900 Subject: [PATCH 5/5] Remove puppet-vitrage from testing The vitrage project was marked inactive[1] and no 2026.1 release will be created for the project. Because it is not installable in Ubuntu which is the only valid testing platform, we'll retire the module as soon as 2026.1 release is cut. [1] f714f8202ec6438a8c131f276f7715726db334e7 Change-Id: I5f8ce9e2fe2a3d81a89637cfba37f0e50f70c276 Signed-off-by: Takashi Kajinami (cherry picked from commit 9a01d71a15fad825d6ffe9566706be4d595116f6) --- Puppetfile | 4 -- README.md | 1 - copy_logs.sh | 7 --- fixtures/scenario001.pp | 25 ++-------- manifests/aodh.pp | 9 +--- manifests/cinder.pp | 12 ++--- manifests/designate.pp | 9 +--- manifests/heat.pp | 9 +--- manifests/ironic.pp | 6 --- manifests/manila.pp | 8 +-- manifests/neutron.pp | 6 --- manifests/nova.pp | 6 --- manifests/octavia.pp | 10 +--- manifests/tempest.pp | 6 --- manifests/vitrage.pp | 105 ---------------------------------------- openstack_modules.txt | 1 - run_tests.sh | 3 -- zuul.d/base.yaml | 1 - 18 files changed, 14 insertions(+), 214 deletions(-) delete mode 100644 manifests/vitrage.pp diff --git a/Puppetfile b/Puppetfile index 50c171e4e..60a3dff1f 100644 --- a/Puppetfile +++ b/Puppetfile @@ -113,10 +113,6 @@ mod 'vswitch', :git => 'https://opendev.org/openstack/puppet-vswitch', :ref => 'stable/2025.2' -mod 'vitrage', - :git => 'https://opendev.org/openstack/puppet-vitrage', - :ref => 'stable/2025.2' - mod 'watcher', :git => 'https://opendev.org/openstack/puppet-watcher', :ref => 'stable/2025.2' diff --git a/README.md b/README.md index d23ff7f7c..69eeefc5f 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,6 @@ scenario](#all-in-one). | ceph | X | | | X | | | | ceph mds | | | | X | | | | ceph rgw | | | | X | | | -| vitrage | X | | | | | | | watcher | X | | | | | | | cloudkitty | X | | | | | | | fwaas | | | | X | X | | diff --git a/copy_logs.sh b/copy_logs.sh index ed37ef70e..61556fcef 100755 --- a/copy_logs.sh +++ b/copy_logs.sh @@ -532,13 +532,6 @@ datastore list EOC fi -# vitrage resources -if [ -d $LOG_DIR/vitrage ]; then - openstack >> $LOG_DIR/openstack_resources/vitrage.txt <<-EOC -rca service list -EOC -fi - # watcher resources if [ -d $LOG_DIR/watcher ]; then openstack >> $LOG_DIR/openstack_resources/watcher.txt <<-EOC diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index 3460cf110..f38b44d53 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -24,15 +24,10 @@ 'Debian': { $ipv6 = false $cache_backend = 'memcached' - # NOTE(tkajinam): Disable due to package conflict - $vitrage = false - $notification_topics = undef } 'RedHat': { $ipv6 = true $cache_backend = 'redis' - $vitrage = true - $notification_topics = ['notifications', 'vitrage_notifications'] } default: { fail("Unsupported osfamily (${facts['os']['family']})") @@ -63,32 +58,23 @@ show_multiple_locations => true, } class { 'openstack_integration::neutron': - notification_topics => $notification_topics, - metering_enabled => true, + metering_enabled => true, } include openstack_integration::placement class { 'openstack_integration::nova': - libvirt_rbd => true, - notification_topics => $notification_topics, - cinder_enabled => true, + libvirt_rbd => true, + cinder_enabled => true, } class { 'openstack_integration::cinder': backend => 'rbd', cinder_backup => 'ceph', } include openstack_integration::ceilometer -class { 'openstack_integration::aodh': - notification_topics => $notification_topics, -} -if $vitrage { - include openstack_integration::vitrage -} +include openstack_integration::aodh class { 'openstack_integration::ceph': ceph_pools => ['glance', 'nova', 'cinder', 'gnocchi', 'backups'], } -class { 'openstack_integration::heat': - notification_topics => $notification_topics, -} +include openstack_integration::heat class { 'openstack_integration::provision': # NOTE(tkajinam): Use raw format to use rbd image cloning when creating # a volume from an image. @@ -109,7 +95,6 @@ ceilometer => true, aodh => true, heat => true, - vitrage => $vitrage, watcher => true, image_format => 'raw', } diff --git a/manifests/aodh.pp b/manifests/aodh.pp index 23c173262..871332080 100644 --- a/manifests/aodh.pp +++ b/manifests/aodh.pp @@ -1,12 +1,6 @@ # Configure the Aodh service # -# [*notification_topics*] -# (optional) AMQP topic used for OpenStack notifications -# Defaults to undef. -# -class openstack_integration::aodh ( - $notification_topics = undef, -) { +class openstack_integration::aodh { include openstack_integration::config include openstack_integration::params @@ -53,7 +47,6 @@ 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $openstack_integration::config::ssl, - notification_topics => $notification_topics, notification_driver => 'messagingv2', } class { 'aodh::db::mysql': diff --git a/manifests/cinder.pp b/manifests/cinder.pp index b1b45697e..8feae3ee1 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -14,15 +14,10 @@ # Possible values: undef, swift, ceph # defaults to undef # -# [*notification_topics*] -# (optional) AMQP topic used for OpenStack notifications -# Defaults to undef. -# class openstack_integration::cinder ( - $backend = 'iscsi', - $volume_encryption = false, - $cinder_backup = undef, - $notification_topics = undef, + $backend = 'iscsi', + $volume_encryption = false, + $cinder_backup = undef, ) { include openstack_integration::config include openstack_integration::params @@ -98,7 +93,6 @@ 'username' => 'cinder', 'password' => 'an_even_bigger_secret', }), - notification_topics => $notification_topics, notification_driver => 'messagingv2', rabbit_use_ssl => $openstack_integration::config::ssl, } diff --git a/manifests/designate.pp b/manifests/designate.pp index 5af27312b..30354fc70 100644 --- a/manifests/designate.pp +++ b/manifests/designate.pp @@ -1,12 +1,6 @@ # Configure the Designate service # -# [*notification_topics*] -# (optional) AMQP topic used for OpenStack notifications -# Defaults to undef. -# -class openstack_integration::designate ( - $notification_topics = undef, -) { +class openstack_integration::designate { include openstack_integration::config include openstack_integration::params include openstack_integration::bind @@ -49,7 +43,6 @@ 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $openstack_integration::config::ssl, - notification_topics => $notification_topics, notification_driver => 'messagingv2', } class { 'designate::db': diff --git a/manifests/heat.pp b/manifests/heat.pp index ac5e1ffdf..08022ec07 100644 --- a/manifests/heat.pp +++ b/manifests/heat.pp @@ -1,12 +1,6 @@ # Configure the Heat service # -# [*notification_topics*] -# (optional) AMQP topic used for OpenStack notifications -# Defaults to undef. -# -class openstack_integration::heat ( - $notification_topics = undef, -) { +class openstack_integration::heat { include openstack_integration::config include openstack_integration::params @@ -76,7 +70,6 @@ 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $openstack_integration::config::ssl, - notification_topics => $notification_topics, notification_driver => 'messagingv2', } class { 'heat::db::mysql': diff --git a/manifests/ironic.pp b/manifests/ironic.pp index 2e7d82ea6..163860a11 100644 --- a/manifests/ironic.pp +++ b/manifests/ironic.pp @@ -1,9 +1,5 @@ # Configure the Ironic service # -# [*notification_topics*] -# (optional) AMQP topic used for OpenStack notifications -# Defaults to undef. -# # [*inspector_backend*] # (optional) The storage backend for storing introspection data. # Defaults to 'database'. @@ -13,7 +9,6 @@ # Defaults to false # class openstack_integration::ironic ( - $notification_topics = undef, $inspector_backend = 'database', $send_power_notifications = false, ) { @@ -99,7 +94,6 @@ 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $openstack_integration::config::ssl, - notification_topics => $notification_topics, notification_driver => 'messagingv2', } class { 'ironic::db::mysql': diff --git a/manifests/manila.pp b/manifests/manila.pp index da718db8c..75e1abaa5 100644 --- a/manifests/manila.pp +++ b/manifests/manila.pp @@ -5,13 +5,8 @@ # Can be 'lvm'. # Defaults to 'lvm'. # -# [*notification_topics*] -# (optional) AMQP topic used for OpenStack notifications -# Defaults to undef. -# class openstack_integration::manila ( - $backend = 'lvm', - $notification_topics = undef, + $backend = 'lvm', ) { include openstack_integration::config include openstack_integration::params @@ -74,7 +69,6 @@ 'username' => 'manila', 'password' => 'an_even_bigger_secret', }), - notification_topics => $notification_topics, notification_driver => 'messagingv2', rabbit_use_ssl => $openstack_integration::config::ssl, } diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 7344537f8..68bc7e3e4 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -45,10 +45,6 @@ # (optional) Flag to enable external dns integration with Designate # Defaults to false. # -# [*notification_topics*] -# (optional) AMQP topic used for OpenStack notifications -# Defaults to undef. -# class openstack_integration::neutron ( $driver = 'openvswitch', $ovn_metadata_agent_enabled = true, @@ -61,7 +57,6 @@ $bgp_dragent_enabled = false, $baremetal_enabled = false, $designate_enabled = false, - $notification_topics = undef, ) { include openstack_integration::config include openstack_integration::params @@ -240,7 +235,6 @@ use_ssl => $openstack_integration::config::ssl, cert_file => $openstack_integration::params::cert_path, key_file => "/etc/neutron/ssl/private/${facts['networking']['fqdn']}.pem", - notification_topics => $notification_topics, notification_driver => 'messagingv2', dhcp_agent_notification => $dhcp_agent_notification, } diff --git a/manifests/nova.pp b/manifests/nova.pp index 241e12c7f..bf929d2bf 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -18,10 +18,6 @@ # (optional) Boolean to configure or not volume encryption # Defaults to false. # -# [*notification_topics*] -# (optional) AMQP topic used for OpenStack notifications -# Defaults to undef. -# # [*cinder_enabled*] # (optional) Boolean to configure or not cinder options. # Defaults to false. @@ -35,7 +31,6 @@ $libvirt_virt_type = 'qemu', $libvirt_cpu_mode = 'none', $volume_encryption = false, - $notification_topics = undef, $cinder_enabled = false, $libvirt_guests_enabled = false, ) { @@ -147,7 +142,6 @@ rabbit_use_ssl => $openstack_integration::config::ssl, notification_driver => 'messagingv2', notify_on_state_change => 'vm_and_task_state', - notification_topics => $notification_topics, ssl_only => $openstack_integration::config::ssl, source_is_ipv6 => $openstack_integration::config::ipv6, key => "/etc/nova/ssl/private/${facts['networking']['fqdn']}.pem", diff --git a/manifests/octavia.pp b/manifests/octavia.pp index 495757836..bbb206344 100644 --- a/manifests/octavia.pp +++ b/manifests/octavia.pp @@ -1,9 +1,5 @@ # Configure the octavia service # -# [*notification_topics*] -# (optional) AMQP topic used for OpenStack notifications -# Defaults to undef. -# # [*provider_driver*] # (optional) Provider driver used in Octavia. # Defaults to 'amphora'. @@ -13,9 +9,8 @@ # Defaults to 'redis'. # class openstack_integration::octavia ( - $notification_topics = undef, - $provider_driver = 'amphora', - $jobboard_backend = 'redis', + $provider_driver = 'amphora', + $jobboard_backend = 'redis', ) { include openstack_integration::config include openstack_integration::params @@ -70,7 +65,6 @@ 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $openstack_integration::config::ssl, - notification_topics => $notification_topics, notification_driver => 'messagingv2', } class { 'octavia::db::mysql': diff --git a/manifests/tempest.pp b/manifests/tempest.pp index d8ac2315f..60a1ab65b 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -100,10 +100,6 @@ # (optional) Define if Trove needs to be tested. # Default to false. # -# [*vitrage*] -# (optional) Define if Vitrage needs to be tested. -# Default to false. -# # [*fwaas*] # (optional) Define if Neutron FWaaS needs to be tested. # Default to false. @@ -186,7 +182,6 @@ $swift = false, $trove = false, $watcher = false, - $vitrage = false, $fwaas = false, $vpnaas = false, $taas = false, @@ -346,7 +341,6 @@ zaqar_available => $zaqar, manila_available => $manila, mistral_available => $mistral, - vitrage_available => $vitrage, gnocchi_available => $gnocchi, watcher_available => $watcher, public_network_name => 'public', diff --git a/manifests/vitrage.pp b/manifests/vitrage.pp deleted file mode 100644 index 94fd641da..000000000 --- a/manifests/vitrage.pp +++ /dev/null @@ -1,105 +0,0 @@ -class openstack_integration::vitrage { - include openstack_integration::config - include openstack_integration::params - - openstack_integration::mq_user { 'vitrage': - password => 'an_even_bigger_secret', - before => Anchor['vitrage::service::begin'], - } - - if $openstack_integration::config::ssl { - openstack_integration::ssl_key { 'vitrage': - notify => Service['httpd'], - require => Anchor['vitrage::install::end'], - } - Exec['update-ca-certificates'] ~> Service['httpd'] - } - - class { 'vitrage::db::mysql': - charset => $openstack_integration::params::mysql_charset, - collate => $openstack_integration::params::mysql_collate, - password => 'vitrage', - host => $openstack_integration::config::host, - } - - class { 'vitrage::db': - database_connection => os_database_connection({ - 'dialect' => 'mysql+pymysql', - 'host' => $openstack_integration::config::ip_for_url, - 'username' => 'vitrage', - 'password' => 'vitrage', - 'database' => 'vitrage', - 'charset' => 'utf8', - 'extra' => $openstack_integration::config::db_extra, - }), - } - - class { 'vitrage::db::sync': } - - class { 'vitrage::logging': - debug => true, - } - - class { 'vitrage': - default_transport_url => os_transport_url({ - 'transport' => $openstack_integration::config::messaging_notify_proto, - 'host' => $openstack_integration::config::host, - 'port' => $openstack_integration::config::messaging_notify_port, - 'username' => 'vitrage', - 'password' => 'an_even_bigger_secret', - }), - notification_transport_url => os_transport_url({ - 'transport' => $openstack_integration::config::messaging_notify_proto, - 'host' => $openstack_integration::config::host, - 'port' => $openstack_integration::config::messaging_notify_port, - 'username' => 'vitrage', - 'password' => 'an_even_bigger_secret', - }), - rabbit_use_ssl => $openstack_integration::config::ssl, - snapshots_interval => 120, - types => 'nova.host,nova.instance,nova.zone,cinder.volume,neutron.port,neutron.network,doctor', - notification_driver => 'messagingv2', - } - - class { 'vitrage::keystone::auth': - public_url => "${openstack_integration::config::base_url}:8999", - internal_url => "${openstack_integration::config::base_url}:8999", - admin_url => "${openstack_integration::config::base_url}:8999", - roles => ['admin', 'service'], - password => 'a_big_secret', - } - class { 'vitrage::keystone::authtoken': - password => 'a_big_secret', - user_domain_name => 'Default', - project_domain_name => 'Default', - auth_url => $openstack_integration::config::keystone_admin_uri, - www_authenticate_uri => $openstack_integration::config::keystone_auth_uri, - memcached_servers => $openstack_integration::config::memcached_servers, - service_token_roles_required => true, - } - class { 'vitrage::api': - enabled => true, - service_name => 'httpd', - } - class { 'vitrage::wsgi::apache': - bind_host => $openstack_integration::config::host, - ssl => $openstack_integration::config::ssl, - ssl_key => "/etc/vitrage/ssl/private/${facts['networking']['fqdn']}.pem", - ssl_cert => $openstack_integration::params::cert_path, - workers => 2, - } - class { 'vitrage::service_credentials': - auth_url => $openstack_integration::config::keystone_auth_uri, - password => 'a_big_secret', - } - class { 'vitrage::graph': } - class { 'vitrage::notifier': - notifiers => ['nova'], - } - class { 'vitrage::persistor': } - class { 'vitrage::coordination': - backend_url => $openstack_integration::config::tooz_url, - } - Class['openstack_integration::redis'] -> Anchor['vitrage::service::begin'] - class { 'vitrage::client': } -} diff --git a/openstack_modules.txt b/openstack_modules.txt index d4d6f869a..aab49f5d8 100644 --- a/openstack_modules.txt +++ b/openstack_modules.txt @@ -26,6 +26,5 @@ swift tempest trove vswitch -vitrage watcher zaqar diff --git a/run_tests.sh b/run_tests.sh index f74656e1d..78f930f28 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -300,9 +300,6 @@ echo "TelemetryAlarming" >> /tmp/openstack/tempest/test-include-list.txt # Gnocchi echo "telemetry_tempest_plugin.scenario.test_gnocchi" >> /tmp/openstack/tempest/test-include-list.txt -# Vitrage -echo "TestEvents" >> /tmp/openstack/tempest/test-include-list.txt - # Test Autoscaling with Telemetry # TODO(tkajinam): This test case is disabled because of instability #echo "test_telemetry_integration" >> /tmp/openstack/tempest/test-include-list.txt diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 1ddfae4d3..098c2bbea 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -37,7 +37,6 @@ - name: openstack/puppet-tempest - name: openstack/puppet-trove - name: openstack/puppet-vswitch - - name: openstack/puppet-vitrage - name: openstack/puppet-watcher - name: openstack/puppet-zaqar - name: openstack/tempest