Merge "Make configure_user and configure_user_role configurable"

manifests/keystone/auth.pp

@@ -27,6 +27,14 @@
 #   (Optional) Should murano endpoint be configured?
 #   Defaults to 'true'.
 #
+# [*configure_user*]
+#   (Optional) Should murano user be configured?
+#   Defaults to 'true'.
+#
+# [*configure_user_role*]
+#   (Optional) Should murano user role be configured?
+#   Defaults to 'true'.
+#
 # [*service_type*]
 #   (Optional) Type of service.
 #   Defaults to 'application-catalog'.
@@ -69,6 +77,8 @@ class murano::keystone::auth(
   $service_type        = 'application-catalog',
   $service_description = 'Murano Application Catalog',
   $configure_endpoint  = true,
+  $configure_user      = true,
+  $configure_user_role = true,
   $region              = 'RegionOne',
   $public_url          = 'http://127.0.0.1:8082',
   $admin_url           = 'http://127.0.0.1:8082',
@@ -76,8 +86,8 @@ class murano::keystone::auth(
 ) {
 
   keystone::resource::service_identity { 'murano':
-    configure_user      => true,
-    configure_user_role => true,
+    configure_user      => $configure_user,
+    configure_user_role => $configure_user_role,
     configure_endpoint  => $configure_endpoint,
     service_name        => $service_name,
     service_type        => $service_type,

manifests/keystone/cfapi_auth.pp

@@ -27,6 +27,14 @@
 #   (Optional) Should murano endpoint be configured?
 #   Defaults to 'true'.
 #
+# [*configure_user*]
+#   (Optional) Should murano user be configured?
+#   Defaults to 'false'.
+#
+# [*configure_user_role*]
+#   (Optional) Should murano user_role be configured?
+#   Defaults to 'false'.
+#
 # [*service_type*]
 #   (Optional) Type of service.
 #   Defaults to 'service-broker'.
@@ -69,6 +77,8 @@ class murano::keystone::cfapi_auth(
   $service_type        = 'service-broker',
   $service_description = 'Murano Service Broker API',
   $configure_endpoint  = true,
+  $configure_user      = false,
+  $configure_user_role = false,
   $region              = 'RegionOne',
   $public_url          = 'http://127.0.0.1:8083',
   $admin_url           = 'http://127.0.0.1:8083',
@@ -77,8 +87,8 @@ class murano::keystone::cfapi_auth(
 
 
   keystone::resource::service_identity { 'murano-cfapi':
-    configure_user      => false,
-    configure_user_role => false,
+    configure_user      => $configure_user,
+    configure_user_role => $configure_user_role,
     configure_endpoint  => $configure_endpoint,
     service_name        => $service_name,
     service_type        => $service_type,

releasenotes/notes/configurable_user_and_role-8e755bb0b27d267f.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - Add ability to set configure_user and configure_user_role
+    parameters in murano::keystone::auth and murano::keystone::cfapi_auth

spec/classes/murano_keystone_auth_spec.rb

@@ -64,4 +64,14 @@ describe 'murano::keystone::auth' do
     it { is_expected.to contain_keystone_endpoint('RegionOne/muranoy::application-catalog') }
   end
 
+  describe 'when not configuring user and role' do
+    let :params do
+      { :password => 'foo',
+        :configure_user => false,
+        :configure_user_role => false }
+    end
+
+    it { is_expected.to_not contain_keystone_user('murano') }
+    it { is_expected.to_not contain_keystone_user_role('murano@services') }
+  end
 end

spec/classes/murano_keystone_cfapi_auth_spec.rb

@@ -51,4 +51,14 @@ describe 'murano::keystone::cfapi_auth' do
     it { is_expected.to contain_keystone_endpoint('RegionOne/murano-cfapiy::service-broker') }
   end
 
+  describe 'when configuring user and role' do
+    let :params do
+      { :password => 'foo',
+        :configure_user => true,
+        :configure_user_role => true }
+    end
+
+    it { is_expected.to contain_keystone_user('murano-cfapi') }
+    it { is_expected.to contain_keystone_user_role('murano-cfapi@services') }
+  end
 end