Re-organizes Contrail services to the correct roles

In current setup some Contrail services belong to the wrong roles.
The Contrail control plane can be impacted if the Analytics database has problems.
Furthermore contrail tripleo puppet modules are being refactored to conform to the
new interface of the puppet-contrail modules.

Closes-Bug: 1659560

Change-Id: Id0dd35b95c5fe9d0fcc1e16c4b7d6cc601f10818

1 files changed, 131 insertions, 18 deletions

diff --git a/manifests/network/contrail/database.pp b/manifests/network/contrail/database.pp
index 58f2670..9786d8f 100644
--- a/manifests/network/contrail/database.pp
+++ b/manifests/network/contrail/database.pp
@@ -13,41 +13,154 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-# == Class: tripleo::network::contrail::control
+# == Class: tripleo::network::contrail::database
 #
-# Configure Contrail Control services
+# Configure Contrail Database services
 #
 # == Parameters:
 #
-# [*host_ip*]
-#  (required) host IP address of Database node
+# [*admin_password*]
+#  (optional) admin password
+#  String value.
+#  Defaults to hiera('contrail::admin_password')
+#
+# [*admin_tenant_name*]
+#  (optional) admin tenant name.
+#  String value.
+#  Defaults to hiera('contrail::admin_tenant_name')
+#
+# [*admin_token*]
+#  (optional) admin token
+#  String value.
+#  Defaults to hiera('contrail::admin_token')
+#
+# [*admin_user*]
+#  (optional) admin user name.
+#  String value.
+#  Defaults to hiera('contrail::admin_user')
+#
+# [*api_server*]
+#  (optional) VIP of Config API
 #  String (IPv4) value.
+#  Defaults to hiera('contrail_config_vip')
+#
+# [*api_port*]
+#  (optional) Port of Config API
+#  String value.
+#  Defaults to hiera('contrail::api_port')
+#
+# [*auth_host*]
+#  (optional) keystone server ip address
+#  String (IPv4) value.
+#  Defaults to hiera('contrail::auth_host')
+#
+# [*cassandra_servers*]
+#  (optional) List IPs+port of Cassandra servers
+#  Array of strings value.
+#  Defaults to hiera('contrail_database_node_ips')
 #
 # [*disc_server_ip*]
 #  (optional) IPv4 address of discovery server.
 #  String (IPv4) value.
-#  Defaults to hiera('contrail::disc_server_ip')
+#  Defaults to hiera('contrail_config_vip'),
 #
 # [*disc_server_port*]
 #  (optional) port Discovery server listens on.
 #  Integer value.
 #  Defaults to hiera('contrail::disc_server_port')
 #
+# [*host_ip*]
+#  (required) host IP address of Database node
+#  String (IPv4) value.
+#
+# [*host_name*]
+#  (optional) host name of Database node
+#  String value.
+#  Defaults to $::hostname
+#
+# [*public_vip*]
+#  (optional) Public virtual ip
+#  String value.
+#  Defaults to hiera('public_virtual_ip')
+#
+# [*step*]
+#  (optional) Step stack is in
+#  Integer value.
+#  Defaults to hiera('step')
+#
+# [*zookeeper_client_ip*]
+#  (optional) Zookeeper listen address
+#  String (IPv4) value.
+#  Defaults to hiera('contrail::database::host_ip')
+#
+# [*zookeeper_hostnames*]
+#  (optional) Zookeeper hostname list
+#  Array of string value.
+#  Defaults to hiera('contrail_database_short_node_names')
+#
+# [*zookeeper_server_ips*]
+#  (optional) Zookeeper ip list
+#  Array of string (IPv4) values
+#  Defaults to hiera('contrail_database_node_ips')
+#
 class tripleo::network::contrail::database(
-  $host_ip,
-  $disc_server_ip = hiera('contrail::disc_server_ip'),
-  $disc_server_port = hiera('contrail::disc_server_port'),
+  $step                 = hiera('step'),
+  $admin_password       = hiera('contrail::admin_password'),
+  $admin_tenant_name    = hiera('contrail::admin_tenant_name'),
+  $admin_token          = hiera('contrail::admin_token'),
+  $admin_user           = hiera('contrail::admin_user'),
+  $api_server           = hiera('contrail_config_vip'),
+  $api_port             = hiera('contrail::api_port'),
+  $auth_host            = hiera('contrail::auth_host'),
+  $cassandra_servers    = hiera('contrail_database_node_ips'),
+  $disc_server_ip       = hiera('contrail_config_vip'),
+  $disc_server_port     = hiera('contrail::disc_server_port'),
+  $host_ip              = hiera('contrail::database::host_ip'),
+  $host_name            = $::hostname,
+  $public_vip           = hiera('public_virtual_ip'),
+  $zookeeper_client_ip  = hiera('contrail::database::host_ip'),
+  $zookeeper_hostnames  = hiera('contrail_database_short_node_names'),
+  $zookeeper_server_ips = hiera('contrail_database_node_ips'),
 )
 {
-  class {'::contrail::database':
-    database_nodemgr_config => {
-      'DEFAULTS'  => {
-        'hostip' => $host_ip,
-      },
-      'DISCOVERY' => {
-        'port'   => $disc_server_port,
-        'server' => $disc_server_ip,
-      },
-    },
+  if $step == 2 {
+    class {'::contrail::database':
+      database_params => {
+        'auth_host'             => $auth_host,
+        'api_server'            => $api_server,
+        'admin_password'        => $admin_password,
+        'admin_tenant_name'     => $admin_tenant_name,
+        'admin_token'           => $admin_token,
+        'admin_user'            => $admin_user,
+        'cassandra_servers'     => $cassandra_servers,
+        'host_ip'               => $host_ip,
+        'disc_server_ip'        => $disc_server_ip,
+        'disc_server_port'      => $disc_server_port,
+        'zookeeper_client_ip'   => $zookeeper_client_ip,
+        'zookeeper_hostnames'   => $zookeeper_hostnames,
+        'zookeeper_server_ips'  => $zookeeper_server_ips,
+        database_nodemgr_config => {
+          'DEFAULT'   => {
+            'hostip' => $host_ip,
+          },
+          'DISCOVERY' => {
+            'port'   => $disc_server_port,
+            'server' => $disc_server_ip,
+          },
+        },
+      }
+    }
+  }
+  if $step >= 5 {
+    class {'::contrail::database::provision_database':
+      api_address                => $api_server,
+      api_port                   => $api_port,
+      database_node_address      => $host_ip,
+      database_node_name         => $host_name,
+      keystone_admin_user        => $admin_user,
+      keystone_admin_password    => $admin_password,
+      keystone_admin_tenant_name => $admin_tenant_name,
+      openstack_vip              => $public_vip,
+    }
   }
 }