Merge "Do not create the _member_ role"

doc/source/usage.rst

@@ -10,10 +10,10 @@ To use os-cloud-config in a project::
 Initializing Keystone for a host
 -----------------------------------
 
-The init-keystone command line utility initializes Keystone for use with
-normal authentication by creating the admin and service tenants, the admin
-and Member roles, the admin user, configure certificates and finally
-registers the initial identity endpoint.
+The init-keystone command line utility initializes Keystone for use with normal
+authentication by creating the admin and service tenants, the admin role, the
+admin user, configure certificates and finally registers the initial identity
+endpoint.
 
  .. note::
 

os_cloud_config/cmd/init_keystone.py

@@ -24,10 +24,9 @@ def parse_args():
     description = textwrap.dedent("""
     Perform initial setup of keystone for a new cloud.
 
-    This will create the admin and service tenants, the admin and _member_
-    roles, the admin user, configure certificates and finally register the
-    initial identity endpoint, after which Keystone may be used with normal
-    authentication.
+    This will create the admin and service tenants, the admin role, the admin
+    user, configure certificates and finally register the initial identity
+    endpoint, after which Keystone may be used with normal authentication.
 
     This command will wait for a user-specified amount of time for a Keystone
     service to be running on the specified host.  The default is a 10 minute

os_cloud_config/keystone.py

@@ -395,7 +395,6 @@ def _create_roles(keystone, timeout=600, poll_interval=10):
             LOG.debug('Unable to create, sleeping for %d seconds.'
                       % poll_interval)
             time.sleep(poll_interval)
-    _create_role(keystone, '_member_')
 
 
 def _create_tenants(keystone):

os_cloud_config/tests/test_keystone.py

@@ -50,9 +50,6 @@ class KeystoneTest(base.TestCase):
         keystone.initialize(
             '192.0.0.3', 'mytoken', 'admin@example.org', 'adminpasswd')
 
-        self.client.roles.create.assert_has_calls(
-            [mock.call('admin'), mock.call('_member_')])
-
         self.client.tenants.create.assert_has_calls(
             [mock.call('admin', None), mock.call('service', None)])
 
@@ -240,8 +237,6 @@ class KeystoneTest(base.TestCase):
 
         keystone._create_roles(self.client)
         sleep.assert_has_calls([mock.call(10), mock.call(10)])
-        self.client.roles.create.assert_has_calls(
-            [mock.call('admin'), mock.call('_member_')])
 
     def test_setup_endpoints(self):
         self.client = mock.MagicMock()