Rename cue service_type to message-broker

Change-Id: I2ce6fef1f526f95143e02f0b5132a5a38ffbc03e

contrib/devstack/lib/cue

@@ -154,7 +154,7 @@ function create_cue_accounts {
 
         if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
             local cue_service=$(get_or_create_service "cue" \
-                "message_queue" "Cue MQ Provisioning Service")
+                "message-broker" "Message Broker Provisioning Service")
             get_or_create_endpoint $cue_service \
                 "$REGION_NAME" \
                 "$CUE_SERVICE_PROTOCOL://$CUE_SERVICE_HOST:$CUE_SERVICE_PORT/" \

contrib/scripts/install/single_vm/user_data_template

@@ -142,7 +142,7 @@ CUE_URL="http://${floating_ip}:8795/"
 source ./devstack/openrc admin admin
 keystone user-create --name cue --tenant service --pass password
 keystone user-role-add --user cue --role admin --tenant service
-keystone service-create --name cue --type "message_queue" --description "Cue MQ Provisioning Service"
+keystone service-create --name cue --type "message-broker" --description "Message Broker Provisioning Service"
 keystone endpoint-create --region $OS_REGION_NAME --service cue --publicurl $CUE_URL --adminurl $CUE_URL --internalurl $CUE_URL
 
 # Install MySQL DB

tests/integration/api/v1/clusters/test_clusters.py

@@ -50,7 +50,7 @@ class ClusterTest(tempest_lib.base.BaseTestCase):
     def _create_cluster(self):
         name = data_utils.rand_name(ClusterTest.__name__ + '-cluster')
         network_id = [self.client.private_network['id']]
-        flavor = CONF.message_queue.flavor
+        flavor = CONF.message_broker.flavor
         size = 3
         return self.client.create_cluster(name, size, flavor, network_id)
 
@@ -240,4 +240,4 @@ class ClusterTest(tempest_lib.base.BaseTestCase):
 
         self.assertRaises(tempest_exceptions.NotFound,
                           self.client.list_clusters,
-                          url='fake_url')
+                          url='fake_url')

tests/integration/common/client.py

@@ -37,7 +37,7 @@ class BaseMessageQueueClient(rest_client.RestClient):
         auth_provider = self._get_keystone_auth_provider()
         super(BaseMessageQueueClient, self).__init__(
             auth_provider=auth_provider,
-            service='message_queue',
+            service='message-broker',
             region='RegionOne',
         )
         self.private_network = self._get_network('private')

tests/integration/common/config.py

@@ -34,12 +34,12 @@ def setup_config(config_file=''):
     TEST_CONF.register_group(identity_group)
     TEST_CONF.register_opts(identity_options, group=identity_group)
 
-    message_queue_group = cfg.OptGroup(name='message_queue')
-    message_queue_options = [
+    message_broker_group = cfg.OptGroup(name='message_broker')
+    message_broker_options = [
         cfg.StrOpt('flavor', default='8795'),
     ]
-    TEST_CONF.register_group(message_queue_group)
-    TEST_CONF.register_opts(message_queue_options, group=message_queue_group)
+    TEST_CONF.register_group(message_broker_group)
+    TEST_CONF.register_opts(message_broker_options, group=message_broker_group)
 
     # Figure out which config to load
     config_to_load = []
@@ -61,4 +61,4 @@ def setup_config(config_file=''):
 def get_config():
     if not TEST_CONF:
         setup_config()
-    return TEST_CONF
+    return TEST_CONF

tests/integration/cue-integration.conf

@@ -7,5 +7,5 @@ username=demo
 tenant_name=demo
 password=secretadmin
 
-[message_queue]
+[message_broker]
 flavor=8795