Don't need nova notifications
Now we have removed nova legacy notifications in Watcher and just consume nova versioned notifications, we don't need notification config in nova.conf Change-Id: I1c9c141d98d858c36ad8bb7be0b95c38ff1d5752
This commit is contained in:
parent
938bd336ca
commit
93890fb290
@ -47,9 +47,6 @@ WATCHER_POLICY_YAML=$WATCHER_CONF_DIR/policy.yaml.sample
|
|||||||
WATCHER_DEVSTACK_DIR=$WATCHER_DIR/devstack
|
WATCHER_DEVSTACK_DIR=$WATCHER_DIR/devstack
|
||||||
WATCHER_DEVSTACK_FILES_DIR=$WATCHER_DEVSTACK_DIR/files
|
WATCHER_DEVSTACK_FILES_DIR=$WATCHER_DEVSTACK_DIR/files
|
||||||
|
|
||||||
NOVA_CONF_DIR=/etc/nova
|
|
||||||
NOVA_CONF=$NOVA_CONF_DIR/nova.conf
|
|
||||||
|
|
||||||
if is_ssl_enabled_service "watcher" || is_service_enabled tls-proxy; then
|
if is_ssl_enabled_service "watcher" || is_service_enabled tls-proxy; then
|
||||||
WATCHER_SERVICE_PROTOCOL="https"
|
WATCHER_SERVICE_PROTOCOL="https"
|
||||||
fi
|
fi
|
||||||
@ -193,9 +190,6 @@ function create_watcher_conf {
|
|||||||
|
|
||||||
iniset $WATCHER_CONF oslo_messaging_notifications driver "messagingv2"
|
iniset $WATCHER_CONF oslo_messaging_notifications driver "messagingv2"
|
||||||
|
|
||||||
iniset $NOVA_CONF oslo_messaging_notifications topics "notifications,watcher_notifications"
|
|
||||||
iniset $NOVA_CONF notifications notify_on_state_change "vm_and_task_state"
|
|
||||||
|
|
||||||
configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR
|
configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR
|
||||||
configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR "watcher_clients_auth"
|
configure_auth_token_middleware $WATCHER_CONF watcher $WATCHER_AUTH_CACHE_DIR "watcher_clients_auth"
|
||||||
|
|
||||||
|
@ -44,6 +44,3 @@ LOGDAYS=2
|
|||||||
[[post-config|$NOVA_CONF]]
|
[[post-config|$NOVA_CONF]]
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
compute_monitors=cpu.virt_driver
|
compute_monitors=cpu.virt_driver
|
||||||
notify_on_state_change = vm_and_task_state
|
|
||||||
[notifications]
|
|
||||||
notify_on_state_change = vm_and_task_state
|
|
||||||
|
@ -48,6 +48,3 @@ LOGDAYS=2
|
|||||||
[[post-config|$NOVA_CONF]]
|
[[post-config|$NOVA_CONF]]
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
compute_monitors=cpu.virt_driver
|
compute_monitors=cpu.virt_driver
|
||||||
notify_on_state_change = vm_and_task_state
|
|
||||||
[notifications]
|
|
||||||
notify_on_state_change = vm_and_task_state
|
|
||||||
|
Loading…
Reference in New Issue
Block a user