From 68e02bbdf77db2ed6c7114f7506d5c820f0e8b63 Mon Sep 17 00:00:00 2001 From: Stephen Ma Date: Fri, 18 Aug 2017 09:02:30 -0700 Subject: Comment out the option oslo_messaging_rabbit.rabbit_password The option oslo_messaging_rabblt.rabbit_password has been deprecated. Therefore the option is commented out in the sample config files etc/trove/ directory. Change-Id: I613087217c88b8a5dbf8dfc3f51e48b8fe4c84c8 --- etc/trove/trove-conductor.conf.sample | 2 +- etc/trove/trove-guestagent.conf.sample | 2 +- etc/trove/trove-taskmanager.conf.sample | 2 +- etc/trove/trove.conf.sample | 2 +- etc/trove/trove.conf.test | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'etc') diff --git a/etc/trove/trove-conductor.conf.sample b/etc/trove/trove-conductor.conf.sample index 8a1f8283..6249ed2e 100644 --- a/etc/trove/trove-conductor.conf.sample +++ b/etc/trove/trove-conductor.conf.sample @@ -52,7 +52,7 @@ connection = mysql+pymysql://root:e1a2c042c828d3566d0a@localhost/trove # The RabbitMQ password. (string value) # Deprecated group/name - [DEFAULT]/rabbit_password -rabbit_password=f7999d1955c5014aa32c +#rabbit_password=f7999d1955c5014aa32c # The RabbitMQ virtual host. (string value) # Deprecated group/name - [DEFAULT]/rabbit_virtual_host diff --git a/etc/trove/trove-guestagent.conf.sample b/etc/trove/trove-guestagent.conf.sample index b3b0b509..9d52a465 100644 --- a/etc/trove/trove-guestagent.conf.sample +++ b/etc/trove/trove-guestagent.conf.sample @@ -105,7 +105,7 @@ rabbit_host=10.0.0.1 # The RabbitMQ password. (string value) # Deprecated group/name - [DEFAULT]/rabbit_password -rabbit_password=f7999d1955c5014aa32c +#rabbit_password=f7999d1955c5014aa32c # The RabbitMQ virtual host. (string value) # Deprecated group/name - [DEFAULT]/rabbit_virtual_host diff --git a/etc/trove/trove-taskmanager.conf.sample b/etc/trove/trove-taskmanager.conf.sample index e034a573..57098681 100644 --- a/etc/trove/trove-taskmanager.conf.sample +++ b/etc/trove/trove-taskmanager.conf.sample @@ -209,7 +209,7 @@ idle_timeout = 3600 # The RabbitMQ password. (string value) # Deprecated group/name - [DEFAULT]/rabbit_password -rabbit_password=f7999d1955c5014aa32c +#rabbit_password=f7999d1955c5014aa32c # The RabbitMQ virtual host. (string value) # Deprecated group/name - [DEFAULT]/rabbit_virtual_host diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample index 5456de02..38d86a50 100644 --- a/etc/trove/trove.conf.sample +++ b/etc/trove/trove.conf.sample @@ -202,7 +202,7 @@ idle_timeout = 3600 # The RabbitMQ password. (string value) # Deprecated group/name - [DEFAULT]/rabbit_password -rabbit_password=f7999d1955c5014aa32c +#rabbit_password=f7999d1955c5014aa32c # The RabbitMQ virtual host. (string value) # Deprecated group/name - [DEFAULT]/rabbit_virtual_host diff --git a/etc/trove/trove.conf.test b/etc/trove/trove.conf.test index 65ef0a03..68823ad6 100644 --- a/etc/trove/trove.conf.test +++ b/etc/trove/trove.conf.test @@ -118,7 +118,7 @@ paste_config_file=api-paste.ini.test [oslo_messaging_rabbit] # AMQP Connection info # Deprecated group/name - [DEFAULT]/rabbit_password -rabbit_password=f7999d1955c5014aa32c +#rabbit_password=f7999d1955c5014aa32c [mysql] -- cgit v1.2.1