diff --git a/inventory/group_vars/all/neutron.yml b/inventory/group_vars/all/neutron.yml index a3f2f72b9c..d85f257ae0 100644 --- a/inventory/group_vars/all/neutron.yml +++ b/inventory/group_vars/all/neutron.yml @@ -25,32 +25,3 @@ neutron_service_region: "{{ service_region }}" # Horizon consumes this var so it must be in the global vars namespace neutron_plugin_type: ml2.lxb - -# Oslo Messaging -# RPC -neutron_oslomsg_rpc_userid: neutron -neutron_oslomsg_rpc_vhost: /neutron -neutron_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -neutron_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -neutron_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -neutron_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -neutron_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -neutron_oslomsg_notify_userid: neutron -neutron_oslomsg_notify_vhost: /neutron -neutron_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -neutron_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -neutron_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -neutron_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -neutron_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# RPC - for Octavia event streamer. -neutron_rabbitmq_userid: neutron -neutron_rabbitmq_vhost: /neutron -neutron_rabbitmq_port: "{{ rabbitmq_port }}" -neutron_rabbitmq_servers: "{{ rabbitmq_servers }}" -neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -neutron_rabbitmq_host_group: "{{ rabbitmq_host_group }}" diff --git a/inventory/group_vars/all/oslo-messaging.yml b/inventory/group_vars/all/oslo-messaging.yml index 6cfad29ae0..9863fd28e4 100644 --- a/inventory/group_vars/all/oslo-messaging.yml +++ b/inventory/group_vars/all/oslo-messaging.yml @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +## Main # RPC oslomsg_rpc_transport: rabbit oslomsg_rpc_port: "{{ rabbitmq_port }}" @@ -27,3 +28,376 @@ oslomsg_notify_servers: "{{ rabbitmq_servers }}" oslomsg_notify_use_ssl: "{{ rabbitmq_use_ssl }}" oslomsg_notify_host_group: "{{ rabbitmq_host_group }}" oslomsg_notify_ssl_param: "{{ (oslomsg_notify_use_ssl | bool) | ternary(1, 0) }}" + +## AODH +aodh_oslomsg_rpc_userid: aodh +aodh_oslomsg_rpc_vhost: /aodh +aodh_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +aodh_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +aodh_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +aodh_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +aodh_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +aodh_oslomsg_notify_userid: aodh +aodh_oslomsg_notify_vhost: /aodh +aodh_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +aodh_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +aodh_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +aodh_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +aodh_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" + +## Barbican +barbican_oslomsg_rpc_userid: barbican +barbican_oslomsg_rpc_vhost: /barbican +barbican_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +barbican_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +barbican_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +barbican_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +barbican_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +barbican_oslomsg_notify_userid: barbican +barbican_oslomsg_notify_vhost: /barbican +barbican_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +barbican_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +barbican_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +barbican_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +barbican_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim to remove when wiring is done in barbican role +barbican_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +barbican_rabbitmq_port: "{{ oslomsg_rpc_port }}" +barbican_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +barbican_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +barbican_rabbitmq_userid: "{{ barbican_oslomsg_rpc_userid }}" +barbican_rabbitmq_vhost: "{{ barbican_oslomsg_rpc_vhost }}" + +## Ceilometer +ceilometer_oslomsg_rpc_userid: ceilometer +ceilometer_oslomsg_rpc_vhost: /ceilometer +ceilometer_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +ceilometer_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +ceilometer_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +ceilometer_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +ceilometer_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +ceilometer_oslomsg_notify_userid: ceilometer +ceilometer_oslomsg_notify_vhost: /ceilometer +ceilometer_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +ceilometer_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +ceilometer_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +ceilometer_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +ceilometer_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim to remove when wiring is done in ceilometer role +ceilometer_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +ceilometer_rabbitmq_port: "{{ oslomsg_rpc_port }}" +ceilometer_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +ceilometer_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +ceilometer_rabbitmq_userid: "{{ ceilometer_oslomsg_rpc_userid }}" +ceilometer_rabbitmq_vhost: "{{ ceilometer_oslomsg_rpc_vhost }}" + +## Cinder +cinder_oslomsg_rpc_userid: cinder +cinder_oslomsg_rpc_vhost: /cinder +cinder_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +cinder_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +cinder_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +cinder_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +cinder_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +cinder_oslomsg_notify_userid: cinder +cinder_oslomsg_notify_vhost: /cinder +cinder_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +cinder_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +cinder_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +cinder_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +cinder_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim to remove when wiring is done in cinder role +cinder_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +cinder_rabbitmq_port: "{{ oslomsg_rpc_port }}" +cinder_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +cinder_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +cinder_rabbitmq_userid: "{{ cinder_oslomsg_rpc_userid }}" +cinder_rabbitmq_vhost: "{{ cinder_oslomsg_rpc_vhost }}" + +## Designate +designate_oslomsg_rpc_userid: designate +designate_oslomsg_rpc_vhost: /designate +designate_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +designate_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +designate_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +designate_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +designate_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +designate_oslomsg_notify_userid: designate +designate_oslomsg_notify_vhost: /designate +designate_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +designate_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +designate_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +designate_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +designate_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim to remove when wiring is done in designate role +designate_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +designate_rabbitmq_port: "{{ oslomsg_rpc_port }}" +designate_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +designate_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +designate_rabbitmq_userid: "{{ designate_oslomsg_rpc_userid }}" +designate_rabbitmq_vhost: "{{ designate_oslomsg_rpc_vhost }}" + +## Glance +glance_oslomsg_rpc_userid: glance +glance_oslomsg_rpc_vhost: /glance +glance_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +glance_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +glance_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +glance_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +glance_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +glance_oslomsg_notify_userid: glance +glance_oslomsg_notify_vhost: /glance +glance_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +glance_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +glance_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +glance_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +glance_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim to remove when wiring is done in ceilometer and glance role +glance_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +glance_rabbitmq_port: "{{ oslomsg_rpc_port }}" +glance_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +glance_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +glance_rabbitmq_userid: "{{ glance_oslomsg_rpc_userid }}" +glance_rabbitmq_vhost: "{{ glance_oslomsg_rpc_vhost }}" + + +## Heat +heat_oslomsg_rpc_userid: heat +heat_oslomsg_rpc_vhost: /heat +heat_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +heat_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +heat_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +heat_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +heat_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +heat_oslomsg_notify_userid: heat +heat_oslomsg_notify_vhost: /heat +heat_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +heat_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +heat_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +heat_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +heat_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" + +## Ironic +ironic_oslomsg_rpc_userid: ironic +ironic_oslomsg_rpc_vhost: /ironic +ironic_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +ironic_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +ironic_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +ironic_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +ironic_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +ironic_oslomsg_notify_userid: ironic +ironic_oslomsg_notify_vhost: /ironic +ironic_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +ironic_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +ironic_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +ironic_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +ironic_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" + +## Keystone +keystone_oslomsg_rpc_userid: keystone +keystone_oslomsg_rpc_vhost: /keystone +keystone_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +keystone_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +keystone_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +keystone_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +keystone_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +keystone_oslomsg_notify_userid: keystone +keystone_oslomsg_notify_vhost: /keystone +keystone_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +keystone_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +keystone_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +keystone_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +keystone_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim until upgrade is fixed +keystone_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +keystone_rabbitmq_port: "{{ oslomsg_rpc_port }}" +keystone_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +keystone_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +keystone_rabbitmq_userid: "{{ keystone_oslomsg_rpc_userid }}" +keystone_rabbitmq_vhost: "{{ keystone_oslomsg_rpc_vhost }}" + +## Magnum +magnum_oslomsg_rpc_userid: magnum +magnum_oslomsg_rpc_vhost: /magnum +magnum_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +magnum_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +magnum_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +magnum_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +magnum_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +magnum_oslomsg_notify_userid: magnum +magnum_oslomsg_notify_vhost: /magnum +magnum_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +magnum_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +magnum_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +magnum_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +magnum_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim until role is fixed +magnum_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +magnum_rabbitmq_port: "{{ oslomsg_rpc_port }}" +magnum_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +magnum_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +magnum_rabbitmq_userid: "{{ magnum_oslomsg_rpc_userid }}" +magnum_rabbitmq_vhost: "{{ magnum_oslomsg_rpc_vhost }}" + +## Neutron +# RPC +neutron_oslomsg_rpc_userid: neutron +neutron_oslomsg_rpc_vhost: /neutron +neutron_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +neutron_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +neutron_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +neutron_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +neutron_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +neutron_oslomsg_notify_userid: neutron +neutron_oslomsg_notify_vhost: /neutron +neutron_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +neutron_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +neutron_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +neutron_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +neutron_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim until octavia role and neutron upgrade is fixed +neutron_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +neutron_rabbitmq_port: "{{ oslomsg_rpc_port }}" +neutron_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +neutron_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +neutron_rabbitmq_userid: "{{ neutron_oslomsg_rpc_userid }}" +neutron_rabbitmq_vhost: "{{ neutron_oslomsg_rpc_vhost }}" +neutron_rabbitmq_telemetry_userid: "{{ neutron_rabbitmq_userid }}" +neutron_rabbitmq_telemetry_password: "{{ neutron_rabbitmq_password }}" +neutron_rabbitmq_telemetry_vhost: "{{ neutron_rabbitmq_vhost }}" +neutron_rabbitmq_telemetry_port: "{{ neutron_rabbitmq_port }}" +neutron_rabbitmq_telemetry_servers: "{{ neutron_rabbitmq_servers }}" +neutron_rabbitmq_telemetry_use_ssl: "{{ neutron_rabbitmq_use_ssl }}" +neutron_rabbitmq_telemetry_host_group: "{{ neutron_rabbitmq_host_group }}" + +## Nova +nova_oslomsg_rpc_userid: nova +nova_oslomsg_rpc_vhost: /nova +nova_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +nova_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +nova_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +nova_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +nova_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +nova_oslomsg_notify_userid: nova +nova_oslomsg_notify_vhost: /nova +nova_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +nova_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +nova_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +nova_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +nova_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim until nova upgrade and ceilometer role is fixed +nova_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +nova_rabbitmq_port: "{{ oslomsg_rpc_port }}" +nova_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +nova_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +nova_rabbitmq_userid: "{{ nova_oslomsg_rpc_userid }}" +nova_rabbitmq_vhost: "{{ nova_oslomsg_rpc_vhost }}" + +## Octavia +octavia_oslomsg_rpc_userid: octavia +octavia_oslomsg_rpc_vhost: /octavia +octavia_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +octavia_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +octavia_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +octavia_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +octavia_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +octavia_oslomsg_notify_userid: octavia +octavia_oslomsg_notify_vhost: /octavia +octavia_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +octavia_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +octavia_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +octavia_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +octavia_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim until octavia role is fixed +octavia_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +octavia_rabbitmq_port: "{{ oslomsg_rpc_port }}" +octavia_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +octavia_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +octavia_rabbitmq_userid: "{{ octavia_oslomsg_rpc_userid }}" +octavia_rabbitmq_vhost: "{{ octavia_oslomsg_rpc_vhost }}" + +## Sahara +sahara_oslomsg_rpc_userid: sahara +sahara_oslomsg_rpc_vhost: /sahara +sahara_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +sahara_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +sahara_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +sahara_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +sahara_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +sahara_oslomsg_notify_userid: sahara +sahara_oslomsg_notify_vhost: /sahara +sahara_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +sahara_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +sahara_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +sahara_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +sahara_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" + +## Swift +swift_oslomsg_rpc_userid: swift +swift_oslomsg_rpc_vhost: /swift +swift_oslomsg_rpc_transport: "{{ oslomsg_notify_transport }}" +swift_oslomsg_rpc_port: "{{ oslomsg_notify_port }}" +swift_oslomsg_rpc_servers: "{{ oslomsg_notify_servers }}" +swift_oslomsg_rpc_use_ssl: "{{ oslomsg_notify_use_ssl }}" +swift_oslomsg_rpc_host_group: "{{ oslomsg_notify_host_group }}" +# TODO: (andymccr) ceilometer with swift does not support SSL rabbitmq connections, so we are hard coding the port and use_ssl var +swift_oslomsg_notify_userid: swift +swift_oslomsg_notify_vhost: /swift +swift_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +swift_oslomsg_notify_port: 5672 +swift_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +swift_oslomsg_notify_use_ssl: False +swift_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Swift is not properly wired yet, so compatibility monkey patching: +# For now swift ceilometer does not work with SSL - this is a speculative option in the hope it gets added +swift_rabbitmq_telemetry_userid: "{{ swift_oslomsg_notify_userid }}" +swift_rabbitmq_telemetry_vhost: "{{ swift_oslomsg_notify_vhost }}" +swift_rabbitmq_telemetry_port: "{{ swift_oslomsg_notify_port }}" +swift_rabbitmq_telemetry_servers: "{{ swift_oslomsg_notify_servers }}" +swift_rabbitmq_telemetry_use_ssl: "{{ swift_oslomsg_notify_use_ssl }}" + +## Tacker +tacker_oslomsg_rpc_userid: tacker +tacker_oslomsg_rpc_vhost: /tacker +tacker_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +tacker_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +tacker_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +tacker_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +tacker_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +tacker_oslomsg_notify_userid: tacker +tacker_oslomsg_notify_vhost: /tacker +tacker_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +tacker_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +tacker_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +tacker_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +tacker_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim until tacker role is fixed +tacker_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +tacker_rabbitmq_port: "{{ oslomsg_rpc_port }}" +tacker_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +tacker_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +tacker_rabbitmq_userid: "{{ tacker_oslomsg_rpc_userid }}" +tacker_rabbitmq_vhost: "{{ tacker_oslomsg_rpc_vhost }}" + +## Trove +trove_oslomsg_rpc_userid: trove +trove_oslomsg_rpc_vhost: /trove +trove_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" +trove_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" +trove_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" +trove_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +trove_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" +trove_oslomsg_notify_userid: trove +trove_oslomsg_notify_vhost: /trove +trove_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" +trove_oslomsg_notify_port: "{{ oslomsg_notify_port }}" +trove_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" +trove_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" +trove_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" +# Shim until trove role is fixed +trove_rabbitmq_host_group: "{{ oslomsg_rpc_host_group }}" +trove_rabbitmq_port: "{{ oslomsg_rpc_port }}" +trove_rabbitmq_servers: "{{ oslomsg_rpc_servers }}" +trove_rabbitmq_use_ssl: "{{ oslomsg_rpc_use_ssl }}" +trove_rabbitmq_userid: "{{ trove_oslomsg_rpc_userid }}" +trove_rabbitmq_vhost: "{{ trove_oslomsg_rpc_vhost }}" diff --git a/inventory/group_vars/aodh_all.yml b/inventory/group_vars/aodh_all.yml index d296063cb9..630e746f05 100644 --- a/inventory/group_vars/aodh_all.yml +++ b/inventory/group_vars/aodh_all.yml @@ -19,29 +19,6 @@ aodh_galera_database: aodh aodh_galera_address: "{{ internal_lb_vip_address }}" aodh_connection_string: "mysql+pymysql://{{ aodh_galera_user }}:{{ aodh_container_db_password }}@{{ aodh_galera_address }}/{{ aodh_galera_database }}?charset=utf8" -# Oslo Messaging -# RPC -aodh_oslomsg_rpc_userid: aodh -aodh_oslomsg_rpc_vhost: /aodh -aodh_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -aodh_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -aodh_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -aodh_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -aodh_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -aodh_oslomsg_notify_userid: aodh -aodh_oslomsg_notify_vhost: /aodh -aodh_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -aodh_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -aodh_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -aodh_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -aodh_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -aodh_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - aodh_service_in_ldap: "{{ service_ldap_backend_enabled }}" aodh_service_publicuri: "{{ openstack_service_publicuri_proto|default(aodh_service_proto) }}://{{ external_lb_vip_address }}:{{ aodh_service_port }}" diff --git a/inventory/group_vars/barbican_all.yml b/inventory/group_vars/barbican_all.yml index 0b6c046c0a..3fe4ee2c1a 100644 --- a/inventory/group_vars/barbican_all.yml +++ b/inventory/group_vars/barbican_all.yml @@ -21,34 +21,6 @@ barbican_galera_address: "{{ galera_address }}" barbican_galera_database: barbican barbican_galera_user: barbican -# Oslo Messaging -# RPC -barbican_oslomsg_rpc_userid: barbican -barbican_oslomsg_rpc_vhost: /barbican -barbican_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -barbican_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -barbican_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -barbican_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -barbican_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -barbican_oslomsg_notify_userid: barbican -barbican_oslomsg_notify_vhost: /barbican -barbican_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -barbican_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -barbican_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -barbican_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -barbican_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -barbican_rabbitmq_host_group: "{{ rabbitmq_host_group }}" -barbican_rabbitmq_port: "{{ rabbitmq_port }}" -barbican_rabbitmq_servers: "{{ rabbitmq_servers }}" -barbican_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -barbican_rabbitmq_userid: barbican -barbican_rabbitmq_vhost: /barbican - # venv fetch configuration barbican_venv_tag: "{{ venv_tag }}" barbican_venv_download_url: "{{ venv_base_download_url }}/barbican-{{ openstack_release }}-{{ ansible_architecture | lower }}.tgz" diff --git a/inventory/group_vars/ceilometer_all.yml b/inventory/group_vars/ceilometer_all.yml index 4303a7ea5f..85960a8265 100644 --- a/inventory/group_vars/ceilometer_all.yml +++ b/inventory/group_vars/ceilometer_all.yml @@ -16,36 +16,6 @@ ceilometer_service_user_name: "{{ hostvars['localhost']['ceilometer_service_user_name'] }}" ceilometer_service_tenant_name: "{{ hostvars['localhost']['ceilometer_service_tenant_name'] }}" -# Oslo Messaging -# RPC -ceilometer_oslomsg_rpc_userid: ceilometer -ceilometer_oslomsg_rpc_vhost: /ceilometer -ceilometer_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -ceilometer_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -ceilometer_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -ceilometer_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -ceilometer_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -ceilometer_oslomsg_notify_userid: ceilometer -ceilometer_oslomsg_notify_vhost: /ceilometer -ceilometer_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -ceilometer_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -ceilometer_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -ceilometer_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -ceilometer_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# These are here rather than in ceilometer_all because -# both the os_ceilometer and os_swift roles require them -ceilometer_rabbitmq_userid: ceilometer -ceilometer_rabbitmq_vhost: /ceilometer -ceilometer_rabbitmq_port: "{{ rabbitmq_port }}" -ceilometer_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -ceilometer_rabbitmq_servers: "{{ rabbitmq_servers }}" -ceilometer_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - ceilometer_service_port: 8777 ceilometer_service_proto: http ceilometer_service_publicuri: "{{ openstack_service_publicuri_proto|default(ceilometer_service_proto) }}://{{ external_lb_vip_address }}:{{ ceilometer_service_port }}" @@ -55,10 +25,6 @@ ceilometer_service_in_ldap: "{{ service_ldap_backend_enabled }}" ceilometer_aodh_enabled: "{{ groups['aodh_all'] is defined and groups['aodh_all'] | length > 0 }}" ceilometer_gnocchi_enabled: "{{ groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0 }}" -# NOTE: these and their swift_all.yml counterpart should be moved back to all.yml once swift with ceilometer gets proper SSL support -swift_rabbitmq_telemetry_port: "{{ rabbitmq_port }}" -swift_rabbitmq_telemetry_use_ssl: "{{ rabbitmq_use_ssl }}" - # Ensure that the package state matches the global setting ceilometer_package_state: "{{ package_state }}" @@ -74,127 +40,3 @@ swift_system_user_name: "{{ hostvars['localhost']['swift_system_user_name'] }}" swift_system_shell: "{{ hostvars['localhost']['swift_system_shell'] }}" swift_system_comment: "{{ hostvars['localhost']['swift_system_comment'] }}" swift_system_home_folder: "{{ hostvars['localhost']['swift_system_home_folder'] }}" - -# Oslo.messaging notifications for telemetry -glance_oslomsg_notify_userid: glance -glance_oslomsg_notify_vhost: /glance -glance_oslomsg_notify_password: "{{ glance_oslomsg_notify_password }}" -glance_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -glance_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -glance_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -glance_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -cinder_oslomsg_notify_userid: cinder -cinder_oslomsg_notify_vhost: /cinder -cinder_oslomsg_notify_password: "{{ cinder_oslomsg_notify_password }}" -cinder_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -cinder_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -cinder_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -cinder_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -nova_oslomsg_notify_userid: nova -nova_oslomsg_notify_vhost: /nova -nova_oslomsg_notify_password: "{{ nova_oslomsg_notify_password }}" -nova_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -nova_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -nova_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -nova_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -heat_oslomsg_notify_userid: heat -heat_oslomsg_notify_vhost: /heat -heat_oslomsg_notify_password: "{{ heat_oslomsg_notify_password }}" -heat_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -heat_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -heat_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -heat_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -keystone_oslomsg_notify_userid: keystone -keystone_oslomsg_notify_vhost: /keystone -keystone_oslomsg_notify_password: "{{ keystone_oslomsg_notify_password }}" -keystone_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -keystone_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -keystone_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -keystone_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -neutron_oslomsg_notify_userid: neutron -neutron_oslomsg_notify_vhost: /neutron -neutron_oslomsg_notify_password: "{{ neutron_oslomsg_notify_password }}" -neutron_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -neutron_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -neutron_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -neutron_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -swift_oslomsg_notify_userid: swift -swift_oslomsg_notify_vhost: /swift -swift_oslomsg_notify_password: "{{ swift_oslomsg_notify_password }}" -swift_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -swift_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -swift_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -swift_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -sahara_oslomsg_notify_userid: sahara -sahara_oslomsg_notify_vhost: /sahara -sahara_oslomsg_notify_password: "{{ sahara_oslomsg_notify_password }}" -sahara_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -sahara_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -sahara_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -sahara_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# Telemetry notifications -glance_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}" -glance_rabbitmq_telemetry_userid: glance -glance_rabbitmq_telemetry_password: "{{ glance_rabbitmq_password }}" -glance_rabbitmq_telemetry_port: "{{ rabbitmq_port }}" -glance_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -glance_rabbitmq_telemetry_vhost: "/glance" - -cinder_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}" -cinder_rabbitmq_telemetry_userid: cinder -cinder_rabbitmq_telemetry_password: "{{ cinder_rabbitmq_password }}" -cinder_rabbitmq_telemetry_port: "{{ rabbitmq_port }}" -cinder_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -cinder_rabbitmq_telemetry_vhost: "/cinder" - -nova_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}" -nova_rabbitmq_telemetry_userid: nova -nova_rabbitmq_telemetry_password: "{{ nova_rabbitmq_password }}" -nova_rabbitmq_telemetry_port: "{{ rabbitmq_port }}" -nova_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -nova_rabbitmq_telemetry_vhost: "/nova" - -heat_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}" -heat_rabbitmq_telemetry_userid: heat -heat_rabbitmq_telemetry_password: "{{ heat_rabbitmq_password }}" -heat_rabbitmq_telemetry_port: "{{ rabbitmq_port }}" -heat_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -heat_rabbitmq_telemetry_vhost: "/heat" - -keystone_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}" -keystone_rabbitmq_telemetry_userid: keystone -keystone_rabbitmq_telemetry_password: "{{ keystone_rabbitmq_password }}" -keystone_rabbitmq_telemetry_port: "{{ rabbitmq_port }}" -keystone_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -keystone_rabbitmq_telemetry_vhost: "/keystone" - -neutron_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}" -neutron_rabbitmq_telemetry_userid: neutron -neutron_rabbitmq_telemetry_password: "{{ neutron_rabbitmq_password }}" -neutron_rabbitmq_telemetry_port: "{{ rabbitmq_port }}" -neutron_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -neutron_rabbitmq_telemetry_vhost: "/neutron" - -swift_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}" -swift_rabbitmq_telemetry_userid: swift -swift_rabbitmq_telemetry_password: "{{ swift_rabbitmq_password }}" -swift_rabbitmq_telemetry_port: "{{ rabbitmq_port }}" -swift_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -swift_rabbitmq_telemetry_vhost: "/swift" - -sahara_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}" -sahara_rabbitmq_telemetry_userid: sahara -sahara_rabbitmq_telemetry_password: "{{ sahara_rabbitmq_password }}" -sahara_rabbitmq_telemetry_port: "{{ rabbitmq_port }}" -sahara_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -sahara_rabbitmq_telemetry_vhost: "/sahara" diff --git a/inventory/group_vars/cinder_all.yml b/inventory/group_vars/cinder_all.yml index 0b711a9e31..16a9e2c265 100644 --- a/inventory/group_vars/cinder_all.yml +++ b/inventory/group_vars/cinder_all.yml @@ -20,44 +20,6 @@ cinder_service_backup_program_enabled: "{{ hostvars['localhost']['cinder_service # These are here rather than in cinder_all because # both the os_ceilometer and os_cinder roles require them -# Oslo Messaging -# RPC -cinder_oslomsg_rpc_userid: cinder -cinder_oslomsg_rpc_vhost: /cinder -cinder_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -cinder_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -cinder_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -cinder_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -cinder_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -cinder_oslomsg_notify_userid: cinder -cinder_oslomsg_notify_vhost: /cinder -cinder_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -cinder_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -cinder_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -cinder_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -cinder_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# RPC -cinder_rabbitmq_userid: cinder -cinder_rabbitmq_vhost: /cinder -cinder_rabbitmq_port: "{{ rabbitmq_port }}" -cinder_rabbitmq_servers: "{{ rabbitmq_servers }}" -cinder_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -cinder_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - -# Telemetry notifications -cinder_rabbitmq_telemetry_userid: "{{ cinder_rabbitmq_userid }}" -cinder_rabbitmq_telemetry_password: "{{ cinder_rabbitmq_password }}" -cinder_rabbitmq_telemetry_vhost: "{{ cinder_rabbitmq_vhost }}" -cinder_rabbitmq_telemetry_port: "{{ cinder_rabbitmq_port }}" -cinder_rabbitmq_telemetry_servers: "{{ cinder_rabbitmq_servers }}" -cinder_rabbitmq_telemetry_use_ssl: "{{ cinder_rabbitmq_use_ssl }}" -cinder_rabbitmq_telemetry_host_group: "{{ cinder_rabbitmq_host_group }}" - # If there are any Ceilometer hosts in the environment, then enable its usage cinder_ceilometer_enabled: "{{ (groups['cinder_all'] is defined) and (groups['cinder_all'] | length > 0) and (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" diff --git a/inventory/group_vars/designate_all.yml b/inventory/group_vars/designate_all.yml index 26a3e220d6..59fe382bc8 100644 --- a/inventory/group_vars/designate_all.yml +++ b/inventory/group_vars/designate_all.yml @@ -18,44 +18,6 @@ designate_galera_address: "{{ galera_address }}" designate_galera_user: designate designate_galera_database_name: designate -# Oslo Messaging -# RPC -designate_oslomsg_rpc_userid: designate -designate_oslomsg_rpc_vhost: /designate -designate_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -designate_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -designate_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -designate_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -designate_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -designate_oslomsg_notify_userid: designate -designate_oslomsg_notify_vhost: /designate -designate_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -designate_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -designate_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -designate_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -designate_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# RPC -designate_rabbitmq_userid: designate -designate_rabbitmq_vhost: /designate -designate_rabbitmq_port: "{{ rabbitmq_port }}" -designate_rabbitmq_servers: "{{ rabbitmq_servers }}" -designate_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -designate_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - -# Telemetry notifications -designate_rabbitmq_telemetry_userid: "{{ designate_rabbitmq_userid }}" -designate_rabbitmq_telemetry_password: "{{ designate_rabbitmq_password }}" -designate_rabbitmq_telemetry_vhost: "{{ designate_rabbitmq_vhost }}" -designate_rabbitmq_telemetry_port: "{{ designate_rabbitmq_port }}" -designate_rabbitmq_telemetry_servers: "{{ designate_rabbitmq_servers }}" -designate_rabbitmq_telemetry_use_ssl: "{{ designate_rabbitmq_use_ssl }}" -designate_rabbitmq_telemetry_host_group: "{{ designate_rabbitmq_host_group }}" - # If there are any Ceilometer hosts in the environment, then enable its usage designate_ceilometer_enabled: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) and (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" diff --git a/inventory/group_vars/glance_all.yml b/inventory/group_vars/glance_all.yml index 130a1c7fec..ae367e52c2 100644 --- a/inventory/group_vars/glance_all.yml +++ b/inventory/group_vars/glance_all.yml @@ -13,44 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Oslo Messaging -# RPC -glance_oslomsg_rpc_userid: glance -glance_oslomsg_rpc_vhost: /glance -glance_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -glance_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -glance_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -glance_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -glance_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -glance_oslomsg_notify_userid: glance -glance_oslomsg_notify_vhost: /glance -glance_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -glance_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -glance_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -glance_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -glance_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# RPC -glance_rabbitmq_userid: glance -glance_rabbitmq_vhost: /glance -glance_rabbitmq_port: "{{ rabbitmq_port }}" -glance_rabbitmq_servers: "{{ rabbitmq_servers }}" -glance_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -glance_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - -# Telemetry notifications -glance_rabbitmq_telemetry_userid: "{{ glance_rabbitmq_userid }}" -glance_rabbitmq_telemetry_password: "{{ glance_rabbitmq_password }}" -glance_rabbitmq_telemetry_vhost: "{{ glance_rabbitmq_vhost }}" -glance_rabbitmq_telemetry_port: "{{ glance_rabbitmq_port }}" -glance_rabbitmq_telemetry_servers: "{{ glance_rabbitmq_servers }}" -glance_rabbitmq_telemetry_use_ssl: "{{ glance_rabbitmq_use_ssl }}" -glance_rabbitmq_telemetry_host_group: "{{ glance_rabbitmq_host_group }}" - # If there are any Ceilometer hosts in the environment, then enable its usage glance_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" diff --git a/inventory/group_vars/heat_all.yml b/inventory/group_vars/heat_all.yml index f267c81d38..198d9b0c49 100644 --- a/inventory/group_vars/heat_all.yml +++ b/inventory/group_vars/heat_all.yml @@ -13,44 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Oslo Messaging -# RPC -heat_oslomsg_rpc_userid: heat -heat_oslomsg_rpc_vhost: /heat -heat_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -heat_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -heat_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -heat_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -heat_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -heat_oslomsg_notify_userid: heat -heat_oslomsg_notify_vhost: /heat -heat_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -heat_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -heat_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -heat_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -heat_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# RPC -heat_rabbitmq_userid: heat -heat_rabbitmq_vhost: /heat -heat_rabbitmq_port: "{{ rabbitmq_port }}" -heat_rabbitmq_servers: "{{ rabbitmq_servers }}" -heat_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -heat_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - -# Telemetry notifications -heat_rabbitmq_telemetry_userid: "{{ heat_rabbitmq_userid }}" -heat_rabbitmq_telemetry_password: "{{ heat_rabbitmq_password }}" -heat_rabbitmq_telemetry_vhost: "{{ heat_rabbitmq_vhost }}" -heat_rabbitmq_telemetry_port: "{{ heat_rabbitmq_port }}" -heat_rabbitmq_telemetry_servers: "{{ heat_rabbitmq_servers }}" -heat_rabbitmq_telemetry_use_ssl: "{{ heat_rabbitmq_use_ssl }}" -heat_rabbitmq_telemetry_host_group: "{{ heat_rabbitmq_host_group }}" - # If there are any Ceilometer hosts in the environment, then enable its usage heat_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" diff --git a/inventory/group_vars/horizon_all.yml b/inventory/group_vars/horizon_all.yml index a3bae62e42..88ca1ca929 100644 --- a/inventory/group_vars/horizon_all.yml +++ b/inventory/group_vars/horizon_all.yml @@ -27,8 +27,6 @@ horizon_enable_neutron_lbaas: "{{ neutron_plugin_base is defined and 'neutron_lb horizon_enable_neutron_fwaas: "{{ neutron_plugin_base is defined and (neutron_plugin_base | intersect(['firewall', 'firewall_v2']) | length > 0) }}" horizon_enable_neutron_vpnaas: "{{ neutron_plugin_base is defined and 'vpnaas' in neutron_plugin_base }}" horizon_enable_ha_router: "{{ neutron_plugin_type.split('.')[0] == 'ml2' and (groups['neutron_l3_agent'] | length >= 2) }}" -horizon_rabbitmq_userid: horizon -horizon_rabbitmq_vhost: /horizon # Ensure that the package state matches the global setting horizon_package_state: "{{ package_state }}" diff --git a/inventory/group_vars/ironic_all.yml b/inventory/group_vars/ironic_all.yml index ee6dea173d..e13652ea48 100644 --- a/inventory/group_vars/ironic_all.yml +++ b/inventory/group_vars/ironic_all.yml @@ -13,33 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Oslo Messaging -# RPC -ironic_oslomsg_rpc_userid: ironic -ironic_oslomsg_rpc_vhost: /ironic -ironic_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -ironic_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -ironic_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -ironic_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -ironic_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -ironic_oslomsg_notify_userid: ironic -ironic_oslomsg_notify_vhost: /ironic -ironic_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -ironic_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -ironic_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -ironic_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -ironic_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -ironic_rabbitmq_userid: ironic -ironic_rabbitmq_vhost: /ironic -ironic_rabbitmq_port: "{{ rabbitmq_port }}" -ironic_rabbitmq_servers: "{{ rabbitmq_servers }}" -ironic_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -ironic_rabbitmq_host_group: "{{ rabbitmq_host_group }}" ironic_service_name: ironic ironic_galera_database: ironic diff --git a/inventory/group_vars/keystone_all.yml b/inventory/group_vars/keystone_all.yml index ab83be3571..67c268dc2d 100644 --- a/inventory/group_vars/keystone_all.yml +++ b/inventory/group_vars/keystone_all.yml @@ -16,44 +16,6 @@ # These are here rather than in keystone_all because # both the os_ceilometer and os_keystone roles require them -# Oslo Messaging -# RPC -keystone_oslomsg_rpc_userid: keystone -keystone_oslomsg_rpc_vhost: /keystone -keystone_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -keystone_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -keystone_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -keystone_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -keystone_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -keystone_oslomsg_notify_userid: keystone -keystone_oslomsg_notify_vhost: /keystone -keystone_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -keystone_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -keystone_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -keystone_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -keystone_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# RPC -keystone_rabbitmq_userid: keystone -keystone_rabbitmq_vhost: /keystone -keystone_rabbitmq_port: "{{ rabbitmq_port }}" -keystone_rabbitmq_servers: "{{ rabbitmq_servers }}" -keystone_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -keystone_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - -# Telemetry notifications -keystone_rabbitmq_telemetry_userid: "{{ keystone_rabbitmq_userid }}" -keystone_rabbitmq_telemetry_password: "{{ keystone_rabbitmq_password }}" -keystone_rabbitmq_telemetry_vhost: "{{ keystone_rabbitmq_vhost }}" -keystone_rabbitmq_telemetry_port: "{{ keystone_rabbitmq_port }}" -keystone_rabbitmq_telemetry_servers: "{{ keystone_rabbitmq_servers }}" -keystone_rabbitmq_telemetry_use_ssl: "{{ keystone_rabbitmq_use_ssl }}" -keystone_rabbitmq_telemetry_host_group: "{{ keystone_rabbitmq_host_group }}" - # If there are any Ceilometer hosts in the environment, then enable its usage keystone_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" diff --git a/inventory/group_vars/magnum_all.yml b/inventory/group_vars/magnum_all.yml index 01bb4b1310..d3f02ebd6f 100644 --- a/inventory/group_vars/magnum_all.yml +++ b/inventory/group_vars/magnum_all.yml @@ -27,34 +27,6 @@ magnum_galera_user: magnum magnum_galera_database_name: magnum_service magnum_galera_address: "{{ galera_address }}" -# Oslo Messaging -# RPC -magnum_oslomsg_rpc_userid: magnum -magnum_oslomsg_rpc_vhost: /magnum -magnum_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -magnum_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -magnum_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -magnum_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -magnum_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -magnum_oslomsg_notify_userid: magnum -magnum_oslomsg_notify_vhost: /magnum -magnum_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -magnum_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -magnum_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -magnum_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -magnum_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -magnum_rabbitmq_userid: magnum -magnum_rabbitmq_vhost: /magnum -magnum_rabbitmq_port: "{{ rabbitmq_port }}" -magnum_rabbitmq_servers: "{{ rabbitmq_servers }}" -magnum_rabbitmq_host_group: "{{ rabbitmq_host_group }}" -magnum_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" - # Ensure that the package state matches the global setting magnum_package_state: "{{ package_state }}" diff --git a/inventory/group_vars/neutron_all.yml b/inventory/group_vars/neutron_all.yml index 73a4b8b26a..80d43326fb 100644 --- a/inventory/group_vars/neutron_all.yml +++ b/inventory/group_vars/neutron_all.yml @@ -13,39 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# These are here rather than in neutron_all because -# both the os_ceilometer and os_neutron roles require them - -# Oslo Messaging -# RPC -neutron_oslomsg_rpc_userid: neutron -neutron_oslomsg_rpc_vhost: /neutron -neutron_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -neutron_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -neutron_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -neutron_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -neutron_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -neutron_oslomsg_notify_userid: neutron -neutron_oslomsg_notify_vhost: /neutron -neutron_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -neutron_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -neutron_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -neutron_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -neutron_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# Telemetry notifications -neutron_rabbitmq_telemetry_userid: "{{ neutron_rabbitmq_userid }}" -neutron_rabbitmq_telemetry_password: "{{ neutron_rabbitmq_password }}" -neutron_rabbitmq_telemetry_vhost: "{{ neutron_rabbitmq_vhost }}" -neutron_rabbitmq_telemetry_port: "{{ neutron_rabbitmq_port }}" -neutron_rabbitmq_telemetry_servers: "{{ neutron_rabbitmq_servers }}" -neutron_rabbitmq_telemetry_use_ssl: "{{ neutron_rabbitmq_use_ssl }}" -neutron_rabbitmq_telemetry_host_group: "{{ neutron_rabbitmq_host_group }}" - # If there are any Designate hosts in the environment, then enable its usage neutron_designate_enabled: "{{ hostvars['localhost']['neutron_designate_enabled'] }}" # If there are any Ceilometer hosts in the environment, then enable its usage diff --git a/inventory/group_vars/nova_all.yml b/inventory/group_vars/nova_all.yml index 31fd7ab8af..d0082871fc 100644 --- a/inventory/group_vars/nova_all.yml +++ b/inventory/group_vars/nova_all.yml @@ -29,44 +29,6 @@ nova_console_port: "{% if nova_console_type == 'spice' %}{{ nova_spice_html5prox # These are here rather than in nova_all because # both the os_ceilometer and os_nova roles require them -# Oslo Messaging -# RPC -nova_oslomsg_rpc_userid: nova -nova_oslomsg_rpc_vhost: /nova -nova_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -nova_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -nova_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -nova_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -nova_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -nova_oslomsg_notify_userid: nova -nova_oslomsg_notify_vhost: /nova -nova_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -nova_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -nova_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -nova_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -nova_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# RPC -nova_rabbitmq_userid: nova -nova_rabbitmq_vhost: /nova -nova_rabbitmq_port: "{{ rabbitmq_port }}" -nova_rabbitmq_servers: "{{ rabbitmq_servers }}" -nova_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -nova_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - -# Telemetry notifications -nova_rabbitmq_telemetry_userid: "{{ nova_rabbitmq_userid }}" -nova_rabbitmq_telemetry_password: "{{ nova_rabbitmq_password }}" -nova_rabbitmq_telemetry_vhost: "{{ nova_rabbitmq_vhost }}" -nova_rabbitmq_telemetry_port: "{{ nova_rabbitmq_port }}" -nova_rabbitmq_telemetry_servers: "{{ nova_rabbitmq_servers }}" -nova_rabbitmq_telemetry_use_ssl: "{{ nova_rabbitmq_use_ssl }}" -nova_rabbitmq_telemetry_host_group: "{{ nova_rabbitmq_host_group }}" - # If there are any Designate hosts in the environment, then enable its usage nova_designate_enabled: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) }}" # If there are any Ceilometer hosts in the environment, then enable its usage diff --git a/inventory/group_vars/octavia_all.yml b/inventory/group_vars/octavia_all.yml index 4a8438e2c5..e681259d1c 100644 --- a/inventory/group_vars/octavia_all.yml +++ b/inventory/group_vars/octavia_all.yml @@ -16,35 +16,6 @@ octavia_service_internalurl: "{{ octavia_service_internaluri }}/v1/%(project_id)s" octavia_service_user_name: octavia -# Oslo Messaging -# RPC -octavia_oslomsg_rpc_userid: octavia -octavia_oslomsg_rpc_vhost: /octavia -octavia_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -octavia_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -octavia_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -octavia_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -octavia_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -octavia_oslomsg_notify_userid: octavia -octavia_oslomsg_notify_vhost: /octavia -octavia_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -octavia_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -octavia_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -octavia_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -octavia_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# RPC -octavia_rabbitmq_userid: octavia -octavia_rabbitmq_vhost: /octavia -octavia_rabbitmq_port: "{{ rabbitmq_port }}" -octavia_rabbitmq_servers: "{{ rabbitmq_servers }}" -octavia_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -octavia_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - # venv fetch configuration octavia_venv_tag: "{{ venv_tag }}" octavia_bin: "/openstack/venvs/octavia-{{ octavia_venv_tag }}/bin" diff --git a/inventory/group_vars/sahara_all.yml b/inventory/group_vars/sahara_all.yml index 5cd78d7b8e..25b4a34e8b 100644 --- a/inventory/group_vars/sahara_all.yml +++ b/inventory/group_vars/sahara_all.yml @@ -11,44 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Oslo Messaging -# RPC -sahara_oslomsg_rpc_userid: sahara -sahara_oslomsg_rpc_vhost: /sahara -sahara_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -sahara_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -sahara_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -sahara_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -sahara_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -sahara_oslomsg_notify_userid: sahara -sahara_oslomsg_notify_vhost: /sahara -sahara_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -sahara_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -sahara_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -sahara_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -sahara_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -#RPC -sahara_rabbitmq_userid: sahara -sahara_rabbitmq_vhost: /sahara -sahara_rabbitmq_port: "{{ rabbitmq_port }}" -sahara_rabbitmq_servers: "{{ rabbitmq_servers }}" -sahara_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -sahara_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - -# Telemetry notifications -sahara_rabbitmq_telemetry_userid: "{{ sahara_rabbitmq_userid }}" -sahara_rabbitmq_telemetry_password: "{{ sahara_rabbitmq_password }}" -sahara_rabbitmq_telemetry_vhost: "{{ sahara_rabbitmq_vhost }}" -sahara_rabbitmq_telemetry_port: "{{ sahara_rabbitmq_port }}" -sahara_rabbitmq_telemetry_servers: "{{ sahara_rabbitmq_servers }}" -sahara_rabbitmq_telemetry_use_ssl: "{{ sahara_rabbitmq_use_ssl }}" -sahara_rabbitmq_telemetry_host_group: "{{ sahara_rabbitmq_host_group }}" - # If there are any Ceilometer and Sahara hosts in the environment, then enable its usage sahara_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['sahara_all'] is defined) and (groups['ceilometer_all'] | length > 0) and (groups['sahara_all'] | length > 0) }}" diff --git a/inventory/group_vars/swift_all.yml b/inventory/group_vars/swift_all.yml index 605530390e..22599b4478 100644 --- a/inventory/group_vars/swift_all.yml +++ b/inventory/group_vars/swift_all.yml @@ -19,28 +19,6 @@ swift_system_shell: "{{ hostvars['localhost']['swift_system_shell'] }}" swift_system_comment: "{{ hostvars['localhost']['swift_system_comment'] }}" swift_system_home_folder: "{{ hostvars['localhost']['swift_system_home_folder'] }}" -# Oslo Messaging -# RPC -swift_oslomsg_rpc_userid: swift -swift_oslomsg_rpc_vhost: /swift - -# Notify -swift_oslomsg_notify_userid: swift -swift_oslomsg_notify_vhost: /swift -swift_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -swift_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -swift_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -swift_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -swift_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# Swift Telemetry notifications -swift_rabbitmq_telemetry_userid: "swift" -swift_rabbitmq_telemetry_vhost: "/swift" -swift_rabbitmq_telemetry_servers: "{{ rabbitmq_servers }}" -swift_rabbitmq_telemetry_host_group: "{{ rabbitmq_host_group }}" - # If there are any Ceilometer and Swift hosts in the environment, then enable its usage swift_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['swift_proxy'] is defined) and (groups['ceilometer_all'] | length > 0) and (groups['swift_proxy'] | length > 0) }}" @@ -50,10 +28,6 @@ swift_service_in_ldap: "{{ service_ldap_backend_enabled }}" # Ensure that the package state matches the global setting swift_package_state: "{{ package_state }}" -# TODO: (andymccr) ceilometer with swift does not support SSL rabbitmq connections, so we are hard coding the port and use_ssl var -swift_rabbitmq_telemetry_port: "5672" -swift_rabbitmq_telemetry_use_ssl: False - # Used to optionally filter Gnocchi-originated traffic in Ceilometermiddleware swift_gnocchi_enabled: "{{ (groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0) }}" diff --git a/inventory/group_vars/tacker_all.yml b/inventory/group_vars/tacker_all.yml index 1ce4aa69f7..ed972b1ee2 100644 --- a/inventory/group_vars/tacker_all.yml +++ b/inventory/group_vars/tacker_all.yml @@ -16,34 +16,6 @@ tacker_service_user_name: tacker tacker_service_tenant_name: service -# Oslo Messaging -# RPC -tacker_oslomsg_rpc_userid: tacker -tacker_oslomsg_rpc_vhost: /tacker -tacker_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -tacker_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -tacker_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -tacker_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -tacker_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -tacker_oslomsg_notify_userid: tacker -tacker_oslomsg_notify_vhost: /tacker -tacker_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -tacker_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -tacker_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -tacker_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -tacker_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -tacker_rabbitmq_userid: tacker -tacker_rabbitmq_vhost: /tacker -tacker_rabbitmq_port: "{{ rabbitmq_port }}" -tacker_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -tacker_rabbitmq_servers: "{{ rabbitmq_servers }}" -tacker_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - tacker_service_publicuri: "{{ openstack_service_publicuri_proto|default(tacker_service_proto) }}://{{ external_lb_vip_address }}:{{ tacker_service_port }}" tacker_service_adminurl: "{{ tacker_service_adminuri }}/" tacker_service_region: "{{ service_region }}" diff --git a/inventory/group_vars/trove_all.yml b/inventory/group_vars/trove_all.yml index c9cb9e754f..afd3fc3c29 100644 --- a/inventory/group_vars/trove_all.yml +++ b/inventory/group_vars/trove_all.yml @@ -20,44 +20,6 @@ trove_galera_user: trove trove_galera_database_name: trove_service trove_galera_address: "{{ galera_address }}" -# Oslo Messaging -# RPC -trove_oslomsg_rpc_userid: trove -trove_oslomsg_rpc_vhost: /trove -trove_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}" -trove_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -trove_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -trove_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -trove_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" - -# Notify -trove_oslomsg_notify_userid: trove -trove_oslomsg_notify_vhost: /trove -trove_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}" -trove_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -trove_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -trove_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -trove_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" - -# TODO(ansmith): remove rabbitmq vars once service file is updated -# to use oslomsg vars -# RPC -trove_rabbitmq_userid: trove -trove_rabbitmq_vhost: /trove -trove_rabbitmq_port: "{{ rabbitmq_port }}" -trove_rabbitmq_servers: "{{ rabbitmq_servers }}" -trove_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}" -trove_rabbitmq_host_group: "{{ rabbitmq_host_group }}" - -# Telemetry notifications -trove_rabbitmq_telemetry_userid: "{{ trove_rabbitmq_userid }}" -trove_rabbitmq_telemetry_password: "{{ trove_rabbitmq_password }}" -trove_rabbitmq_telemetry_vhost: "{{ trove_rabbitmq_vhost }}" -trove_rabbitmq_telemetry_port: "{{ trove_rabbitmq_port }}" -trove_rabbitmq_telemetry_servers: "{{ trove_rabbitmq_servers }}" -trove_rabbitmq_telemetry_use_ssl: "{{ trove_rabbitmq_use_ssl }}" -trove_rabbitmq_telemetry_host_group: "{{ trove_rabbitmq_host_group }}" - # If there are any Ceilometer hosts in the environment, then enable its usage trove_ceilometer_enabled: "{{ (groups['trove_all'] is defined) and (groups['trove_all'] | length > 0) and (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}" diff --git a/playbooks/defaults/repo_packages/nova_consoles.yml b/playbooks/defaults/repo_packages/nova_consoles.yml index cec194cff2..3a8f989db5 100644 --- a/playbooks/defaults/repo_packages/nova_consoles.yml +++ b/playbooks/defaults/repo_packages/nova_consoles.yml @@ -31,7 +31,7 @@ novncproxy_git_install_branch: 7d60e97cc98ed9462f1ae4da5b6c3f3a85cf981b # HEAD o novncproxy_git_project_group: nova_console ## spice-html5 from source -spicehtml5_git_repo: https://github.com/SPICE/spice-html5 +spicehtml5_git_repo: https://gitlab.freedesktop.org/spice/spice-html5.git spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 31.03.2018 spicehtml5_git_project_group: nova_console diff --git a/playbooks/os-aodh-install.yml b/playbooks/os-aodh-install.yml index 37d1cb1d1b..d7b671bb42 100644 --- a/playbooks/os-aodh-install.yml +++ b/playbooks/os-aodh-install.yml @@ -19,17 +19,6 @@ user: root pre_tasks: - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ aodh_rabbitmq_userid }}" - password: "{{ aodh_rabbitmq_password }}" - vhost: "{{ aodh_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ aodh_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['aodh_api'][0] - - groups[aodh_rabbitmq_host_group] | length > 0 - - include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: diff --git a/playbooks/os-barbican-install.yml b/playbooks/os-barbican-install.yml index 24a5b22fc0..eae20e5f53 100644 --- a/playbooks/os-barbican-install.yml +++ b/playbooks/os-barbican-install.yml @@ -19,16 +19,6 @@ user: root pre_tasks: - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ barbican_rabbitmq_userid }}" - password: "{{ barbican_rabbitmq_password }}" - vhost: "{{ barbican_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ barbican_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['barbican_api'][0] - - groups[barbican_rabbitmq_host_group] | length > 0 - include: common-tasks/oslomsg-rpc-vhost-user.yml static: no @@ -39,6 +29,7 @@ when: - inventory_hostname == groups['barbican_api'][0] - groups[barbican_oslomsg_rpc_host_group] | length > 0 + - include: common-tasks/oslomsg-notify-vhost-user.yml static: no vars: diff --git a/playbooks/os-ceilometer-install.yml b/playbooks/os-ceilometer-install.yml index 6a15b34960..1dbcf46b72 100644 --- a/playbooks/os-ceilometer-install.yml +++ b/playbooks/os-ceilometer-install.yml @@ -19,16 +19,6 @@ user: root pre_tasks: - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ ceilometer_rabbitmq_userid }}" - password: "{{ ceilometer_rabbitmq_password }}" - vhost: "{{ ceilometer_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ ceilometer_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['ceilometer_central_container'][0] - - groups[ceilometer_rabbitmq_host_group] | length > 0 - include: common-tasks/oslomsg-rpc-vhost-user.yml static: no diff --git a/playbooks/os-cinder-install.yml b/playbooks/os-cinder-install.yml index 21a97e0f38..0917eacbad 100644 --- a/playbooks/os-cinder-install.yml +++ b/playbooks/os-cinder-install.yml @@ -21,32 +21,9 @@ tags: - cinder tasks: - - name: Configure rabbitmq vhost/user - include: common-tasks/rabbitmq-vhost-user.yml - vars: - user: "{{ cinder_rabbitmq_userid }}" - password: "{{ cinder_rabbitmq_password }}" - vhost: "{{ cinder_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ cinder_rabbitmq_host_group }}" - when: - - "groups[cinder_rabbitmq_host_group] | length > 0" - run_once: yes - - name: Configure rabbitmq vhost/user (telemetry) - include: common-tasks/rabbitmq-vhost-user.yml - vars: - user: "{{ cinder_rabbitmq_telemetry_userid }}" - password: "{{ cinder_rabbitmq_telemetry_password }}" - vhost: "{{ cinder_rabbitmq_telemetry_vhost }}" - _rabbitmq_host_group: "{{ cinder_rabbitmq_telemetry_host_group }}" - when: - - "cinder_ceilometer_enabled | bool" - - "groups[cinder_rabbitmq_telemetry_host_group] is defined" - - "groups[cinder_rabbitmq_telemetry_host_group] | length > 0" - - "groups[cinder_rabbitmq_telemetry_host_group] != groups[cinder_rabbitmq_host_group]" - run_once: yes - - - include: common-tasks/oslomsg-rpc-vhost-user.yml + - name: Configure oslo messaging rpc vhost/user + include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: rpc_user: "{{ cinder_oslomsg_rpc_userid }}" @@ -55,7 +32,9 @@ when: - groups[cinder_oslomsg_rpc_host_group] | length > 0 run_once: yes - - include: common-tasks/oslomsg-notify-vhost-user.yml + + - name: Configure oslo messaging notify vhost/user + include: common-tasks/oslomsg-notify-vhost-user.yml static: no vars: notify_user: "{{ cinder_oslomsg_notify_userid }}" diff --git a/playbooks/os-designate-install.yml b/playbooks/os-designate-install.yml index c4eeb5d524..fe95e40491 100644 --- a/playbooks/os-designate-install.yml +++ b/playbooks/os-designate-install.yml @@ -22,29 +22,6 @@ user: root pre_tasks: - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ designate_rabbitmq_userid }}" - password: "{{ designate_rabbitmq_password }}" - vhost: "{{ designate_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ designate_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['designate_all'][0] - - groups[designate_rabbitmq_host_group] | length > 0 - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ designate_rabbitmq_telemetry_userid }}" - password: "{{ designate_rabbitmq_telemetry_password }}" - vhost: "{{ designate_rabbitmq_telemetry_vhost }}" - _rabbitmq_host_group: "{{ designate_rabbitmq_telemetry_host_group }}" - when: - - designate_ceilometer_enabled | bool - - inventory_hostname == groups['designate_all'][0] - - groups[designate_rabbitmq_telemetry_host_group] is defined - - groups[designate_rabbitmq_telemetry_host_group] | length > 0 - - groups[designate_rabbitmq_telemetry_host_group] != groups[designate_rabbitmq_host_group] - include: common-tasks/oslomsg-rpc-vhost-user.yml static: no diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml index afefefd728..40ee058752 100644 --- a/playbooks/os-glance-install.yml +++ b/playbooks/os-glance-install.yml @@ -21,32 +21,8 @@ tags: - glance tasks: - - name: Configure rabbitmq vhost/user - include: common-tasks/rabbitmq-vhost-user.yml - vars: - user: "{{ glance_rabbitmq_userid }}" - password: "{{ glance_rabbitmq_password }}" - vhost: "{{ glance_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ glance_rabbitmq_host_group }}" - when: - - groups[glance_rabbitmq_host_group] | length > 0 - run_once: yes - - - name: Configure rabbitmq vhost/user (telemetry) - include: common-tasks/rabbitmq-vhost-user.yml - vars: - user: "{{ glance_rabbitmq_telemetry_userid }}" - password: "{{ glance_rabbitmq_telemetry_password }}" - vhost: "{{ glance_rabbitmq_telemetry_vhost }}" - _rabbitmq_host_group: "{{ glance_rabbitmq_telemetry_host_group }}" - when: - - glance_ceilometer_enabled | bool - - groups[glance_rabbitmq_telemetry_host_group] is defined - - groups[glance_rabbitmq_telemetry_host_group] | length > 0 - - groups[glance_rabbitmq_telemetry_host_group] != groups[glance_rabbitmq_host_group] - run_once: yes - - - include: common-tasks/oslomsg-rpc-vhost-user.yml + - name: Configure oslo messaging rpc vhost/user + include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: rpc_user: "{{ glance_oslomsg_rpc_userid }}" @@ -54,7 +30,9 @@ rpc_vhost: "{{ glance_oslomsg_rpc_vhost }}" when: - groups[glance_oslomsg_rpc_host_group] | length > 0 - - include: common-tasks/oslomsg-notify-vhost-user.yml + + - name: Configure oslo.messaging notify vhost/user + include: common-tasks/oslomsg-notify-vhost-user.yml static: no vars: notify_user: "{{ glance_oslomsg_notify_userid }}" diff --git a/playbooks/os-heat-install.yml b/playbooks/os-heat-install.yml index 9152c0464b..4b724fc273 100644 --- a/playbooks/os-heat-install.yml +++ b/playbooks/os-heat-install.yml @@ -19,30 +19,6 @@ user: root pre_tasks: - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ heat_rabbitmq_userid }}" - password: "{{ heat_rabbitmq_password }}" - vhost: "{{ heat_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ heat_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['heat_all'][0] - - groups[heat_rabbitmq_host_group] | length > 0 - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ heat_rabbitmq_telemetry_userid }}" - password: "{{ heat_rabbitmq_telemetry_password }}" - vhost: "{{ heat_rabbitmq_telemetry_vhost }}" - _rabbitmq_host_group: "{{ heat_rabbitmq_telemetry_host_group }}" - when: - - heat_ceilometer_enabled | bool - - inventory_hostname == groups['heat_all'][0] - - groups[heat_rabbitmq_telemetry_host_group] is defined - - groups[heat_rabbitmq_telemetry_host_group] | length > 0 - - groups[heat_rabbitmq_telemetry_host_group] != groups[heat_rabbitmq_host_group] - - include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: diff --git a/playbooks/os-ironic-install.yml b/playbooks/os-ironic-install.yml index fad77266fb..b4dc5d631f 100644 --- a/playbooks/os-ironic-install.yml +++ b/playbooks/os-ironic-install.yml @@ -19,17 +19,6 @@ user: root pre_tasks: - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ ironic_rabbitmq_userid }}" - password: "{{ ironic_rabbitmq_password }}" - vhost: "{{ ironic_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ ironic_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['ironic_all'][0] - - groups[ironic_rabbitmq_host_group] | length > 0 - - include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index acfb8ae48d..6d8448b3b6 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -37,32 +37,8 @@ - keystone tasks: - - name: Configure rabbitmq vhost/user - include: common-tasks/rabbitmq-vhost-user.yml - vars: - user: "{{ keystone_rabbitmq_userid }}" - password: "{{ keystone_rabbitmq_password }}" - vhost: "{{ keystone_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ keystone_rabbitmq_host_group }}" - when: - - "groups[keystone_rabbitmq_host_group] | length > 0" - run_once: yes - - - name: Configure rabbitmq vhost/user (telemetry) - include: common-tasks/rabbitmq-vhost-user.yml - vars: - user: "{{ keystone_rabbitmq_telemetry_userid }}" - password: "{{ keystone_rabbitmq_telemetry_password }}" - vhost: "{{ keystone_rabbitmq_telemetry_vhost }}" - _rabbitmq_host_group: "{{ keystone_rabbitmq_telemetry_host_group }}" - when: - - "keystone_ceilometer_enabled | bool" - - "groups[keystone_rabbitmq_telemetry_host_group] is defined" - - "groups[keystone_rabbitmq_telemetry_host_group] | length > 0" - - "groups[keystone_rabbitmq_telemetry_host_group] != groups[keystone_rabbitmq_host_group]" - run_once: yes - - - include: common-tasks/oslomsg-rpc-vhost-user.yml + - name: Configure oslo messaging rpc vhost/user + include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: rpc_user: "{{ keystone_oslomsg_rpc_userid }}" @@ -72,7 +48,8 @@ - groups[keystone_oslomsg_rpc_host_group] | length > 0 run_once: yes - - include: common-tasks/oslomsg-notify-vhost-user.yml + - name: Configure oslo messaging notify vhost/user + include: common-tasks/oslomsg-notify-vhost-user.yml static: no vars: notify_user: "{{ keystone_oslomsg_notify_userid }}" diff --git a/playbooks/os-magnum-install.yml b/playbooks/os-magnum-install.yml index bfd1f3d7dc..7c64c90ece 100644 --- a/playbooks/os-magnum-install.yml +++ b/playbooks/os-magnum-install.yml @@ -30,17 +30,6 @@ static: no when: - hostvars['localhost']['resolvconf_enabled'] | bool - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ magnum_rabbitmq_userid }}" - password: "{{ magnum_rabbitmq_password }}" - vhost: "{{ magnum_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ magnum_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['magnum_all'][0] - - groups[magnum_rabbitmq_host_group] | length > 0 - - include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: @@ -50,7 +39,6 @@ when: - inventory_hostname == groups['magnum_all'][0] - groups[magnum_oslomsg_rpc_host_group] | length > 0 - - include: common-tasks/mysql-db-user.yml static: no vars: diff --git a/playbooks/os-neutron-install.yml b/playbooks/os-neutron-install.yml index 977fad2c63..1c48b2fb0f 100644 --- a/playbooks/os-neutron-install.yml +++ b/playbooks/os-neutron-install.yml @@ -35,32 +35,8 @@ - neutron tasks: - - name: Configure rabbitmq vhost/user - include: common-tasks/rabbitmq-vhost-user.yml - vars: - user: "{{ neutron_rabbitmq_userid }}" - password: "{{ neutron_rabbitmq_password }}" - vhost: "{{ neutron_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ neutron_rabbitmq_host_group }}" - when: - - groups[neutron_rabbitmq_host_group] | length > 0 - run_once: yes - - - name: Configure rabbitmq vhost/user (telemetry) - include: common-tasks/rabbitmq-vhost-user.yml - vars: - user: "{{ neutron_rabbitmq_telemetry_userid }}" - password: "{{ neutron_rabbitmq_telemetry_password }}" - vhost: "{{ neutron_rabbitmq_telemetry_vhost }}" - _rabbitmq_host_group: "{{ neutron_rabbitmq_telemetry_host_group }}" - when: - - neutron_ceilometer_enabled | bool - - groups[neutron_rabbitmq_telemetry_host_group] is defined - - groups[neutron_rabbitmq_telemetry_host_group] | length > 0 - - groups[neutron_rabbitmq_telemetry_host_group] != groups[neutron_rabbitmq_host_group] - run_once: yes - - - include: common-tasks/oslomsg-rpc-vhost-user.yml + - name: Configure oslo messaging rpc vhost/user + include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: rpc_user: "{{ neutron_oslomsg_rpc_userid }}" @@ -70,7 +46,8 @@ - groups[neutron_oslomsg_rpc_host_group] | length > 0 run_once: yes - - include: common-tasks/oslomsg-notify-vhost-user.yml + - name: Configure oslo messaging notify vhost/user + include: common-tasks/oslomsg-notify-vhost-user.yml static: no vars: notify_user: "{{ neutron_oslomsg_notify_userid }}" diff --git a/playbooks/os-nova-install.yml b/playbooks/os-nova-install.yml index caa827dacd..00c1d1d444 100644 --- a/playbooks/os-nova-install.yml +++ b/playbooks/os-nova-install.yml @@ -21,33 +21,8 @@ tags: - nova tasks: - - - name: Configure rabbitmq vhost/user (nova) - include: common-tasks/rabbitmq-vhost-user.yml - vars: - user: "{{ nova_rabbitmq_userid }}" - password: "{{ nova_rabbitmq_password }}" - vhost: "{{ nova_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ nova_rabbitmq_host_group }}" - when: - - groups[nova_rabbitmq_host_group] | length > 0 - run_once: yes - - - name: Configure rabbitmq vhost/user (nova/telemetry) - include: common-tasks/rabbitmq-vhost-user.yml - vars: - user: "{{ nova_rabbitmq_telemetry_userid }}" - password: "{{ nova_rabbitmq_telemetry_password }}" - vhost: "{{ nova_rabbitmq_telemetry_vhost }}" - _rabbitmq_host_group: "{{ nova_rabbitmq_telemetry_host_group }}" - when: - - nova_ceilometer_enabled | bool - - groups[nova_rabbitmq_telemetry_host_group] is defined - - groups[nova_rabbitmq_telemetry_host_group] | length > 0 - - groups[nova_rabbitmq_telemetry_host_group] != groups[nova_rabbitmq_host_group] - run_once: yes - - - include: common-tasks/oslomsg-rpc-vhost-user.yml + - name: Configure oslo messaging rpc vhost/user + include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: rpc_user: "{{ nova_oslomsg_rpc_userid }}" @@ -57,7 +32,8 @@ - groups[nova_oslomsg_rpc_host_group] | length > 0 run_once: yes - - include: common-tasks/oslomsg-notify-vhost-user.yml + - name: Configure oslo.messaging notify vhost/user + include: common-tasks/oslomsg-notify-vhost-user.yml static: no vars: notify_user: "{{ nova_oslomsg_notify_userid }}" diff --git a/playbooks/os-octavia-install.yml b/playbooks/os-octavia-install.yml index 26dc7ec8a7..4677457009 100644 --- a/playbooks/os-octavia-install.yml +++ b/playbooks/os-octavia-install.yml @@ -20,17 +20,6 @@ pre_tasks: - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" static: no - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ octavia_rabbitmq_userid }}" - password: "{{ octavia_rabbitmq_password }}" - vhost: "{{ octavia_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ octavia_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['octavia_all'][0] - - groups[octavia_rabbitmq_host_group] | length > 0 - - include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: diff --git a/playbooks/os-sahara-install.yml b/playbooks/os-sahara-install.yml index 3062361a79..21acf64ecc 100644 --- a/playbooks/os-sahara-install.yml +++ b/playbooks/os-sahara-install.yml @@ -17,31 +17,9 @@ user: root pre_tasks: - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ sahara_rabbitmq_userid }}" - password: "{{ sahara_rabbitmq_password }}" - vhost: "{{ sahara_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ sahara_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['sahara_all'][0] - - groups[sahara_rabbitmq_host_group] | length > 0 - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ sahara_rabbitmq_telemetry_userid }}" - password: "{{ sahara_rabbitmq_telemetry_password }}" - vhost: "{{ sahara_rabbitmq_telemetry_vhost }}" - _rabbitmq_host_group: "{{ sahara_rabbitmq_telemetry_host_group }}" - when: - - sahara_ceilometer_enabled | bool - - inventory_hostname == groups['sahara_all'][0] - - groups[sahara_rabbitmq_telemetry_host_group] is defined - - groups[sahara_rabbitmq_telemetry_host_group] | length > 0 - - groups[sahara_rabbitmq_telemetry_host_group] != groups[sahara_rabbitmq_host_group] - - include: common-tasks/oslomsg-rpc-vhost-user.yml + - name: Configure oslo messaging rpc vhost/user + include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: rpc_user: "{{ sahara_oslomsg_rpc_userid }}" @@ -50,7 +28,9 @@ when: - inventory_hostname == groups['sahara_all'][0] - groups[sahara_oslomsg_rpc_host_group] | length > 0 - - include: common-tasks/oslomsg-notify-vhost-user.yml + + - name: Configure oslo messaging notify vhost/user + include: common-tasks/oslomsg-notify-vhost-user.yml static: no vars: notify_user: "{{ sahara_oslomsg_notify_userid }}" diff --git a/playbooks/os-tacker-install.yml b/playbooks/os-tacker-install.yml index b96f68a5c6..731d2d258f 100644 --- a/playbooks/os-tacker-install.yml +++ b/playbooks/os-tacker-install.yml @@ -19,17 +19,6 @@ user: root pre_tasks: - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ tacker_rabbitmq_userid }}" - password: "{{ tacker_rabbitmq_password }}" - vhost: "{{ tacker_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ tacker_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['tacker_all'][0] - - groups[tacker_rabbitmq_host_group] | length > 0 - - include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: diff --git a/playbooks/os-trove-install.yml b/playbooks/os-trove-install.yml index 473742771a..4d4837579a 100644 --- a/playbooks/os-trove-install.yml +++ b/playbooks/os-trove-install.yml @@ -22,30 +22,6 @@ user: root pre_tasks: - include: "common-tasks/os-{{ container_tech | default('lxc') }}-container-setup.yml" - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ trove_rabbitmq_userid }}" - password: "{{ trove_rabbitmq_password }}" - vhost: "{{ trove_rabbitmq_vhost }}" - _rabbitmq_host_group: "{{ trove_rabbitmq_host_group }}" - when: - - inventory_hostname == groups['trove_all'][0] - - groups[trove_rabbitmq_host_group] | length > 0 - - include: common-tasks/rabbitmq-vhost-user.yml - static: no - vars: - user: "{{ trove_rabbitmq_telemetry_userid }}" - password: "{{ trove_rabbitmq_telemetry_password }}" - vhost: "{{ trove_rabbitmq_telemetry_vhost }}" - _rabbitmq_host_group: "{{ trove_rabbitmq_telemetry_host_group }}" - when: - - trove_ceilometer_enabled | bool - - inventory_hostname == groups['trove_all'][0] - - groups[trove_rabbitmq_telemetry_host_group] is defined - - groups[trove_rabbitmq_telemetry_host_group] | length > 0 - - groups[trove_rabbitmq_telemetry_host_group] != groups[trove_rabbitmq_host_group] - - include: common-tasks/oslomsg-rpc-vhost-user.yml static: no vars: diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index c3da93520c..cbed4da8f2 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -174,6 +174,9 @@ function gate_job_exit_tasks { # files are viewable via a web browser in OpenStack-CI. rename_log_files + # System status & Information + log_instance_info + # Generate the ARA report if enabled if [ "$GATE_EXIT_RUN_ARA" == true ]; then @@ -350,6 +353,11 @@ function get_instance_info { fi df -h > "/openstack/log/instance-info/report_fs_df_${TS}.log" || true + lsmod > "/openstack/log/instance-info/lsmod_${TS}.log" || true + free -m > "/openstack/log/instance-info/free_${TS}.log" || true + cat /proc/cpuinfo > "/openstack/log/instance-info/cpuinfo_${TS}.log" || true + ps -eo user,pid,ppid,lwp,%cpu,%mem,size,rss,cmd > "/openstack/log/instance-info/ps_${TS}.log" || true + netstat -tulpn > "/openstack/log/instance-info/netstat_${TS}.log" || true } function get_pip {