SM-Mitaka: fix keystone default domain for kilo/liberty

Closes-Bug: #1597190
Closes-Bug: #1605823

missed patch2 of https://review.opencontrail.org/#/c/22243/

Change-Id: Ibd82d9e73051b3a2a13fbc06feb0c3afcd622bf2

contrail/environment/modules/contrail/manifests/profile/openstack/keystone.pp

@@ -2,6 +2,7 @@
   $internal_vip = $::contrail::params::internal_vip,
   $host_control_ip = $::contrail::params::host_ip,
   $sync_db = $::contrail::params::sync_db,
+  $package_sku       = $::contrail::params::package_sku,
   $openstack_verbose = $::contrail::params::os_verbose,
   $openstack_debug   = $::contrail::params::os_debug,
   $service_password  = $::contrail::params::os_mysql_service_password,
@@ -29,6 +30,12 @@
     allowed_hosts => $allowed_hosts,
   }
 
+  if ( $package_sku =~ /^*:13\.0.*$/) {
+    $default_domain = 'default'
+  } else {
+    $default_domain = undef
+  }
+
   if ($internal_vip != "" and $internal_vip != undef) {
     $keystone_db_conn = join(["mysql://keystone:",$database_credentials,":3306/keystone"],'')
     notify {"KEYSTONE DB CONN => ${keystone_db_conn}":;}
@@ -40,6 +47,7 @@
       sync_db         => true,
       public_port     => '6000',
       admin_port      => '35358',
+      default_domain  => $default_domain,
       database_idle_timeout => '180',
       rabbit_hosts    => $openstack_rabbit_servers,
       verbose         => $openstack_verbose,
@@ -63,7 +71,7 @@
     class { '::keystone':
       admin_token     =>  $admin_token,
       database_connection => $keystone_db_conn,
-      default_domain  => 'default',
+      default_domain  => $default_domain,
       enabled         => true,
       admin_bind_host => $admin_bind_host,
       sync_db         => true,