6 files changed, 113 insertions, 13 deletions
diff --git a/manifests/certmonger/mysql.pp b/manifests/certmonger/mysql.pp
index 62aff9a..9cb6b13 100644
--- a/manifests/certmonger/mysql.pp
+++ b/manifests/certmonger/mysql.pp
@@ -31,11 +31,6 @@
 #   (Optional) The CA that certmonger will use to generate the certificates.
 #   Defaults to hiera('certmonger_ca', 'local').
 #
-# [*mysql_network*]
-#   (Optional) The network name where the mysql endpoint is listening on.
-#   This is set by t-h-t.
-#   Defaults to hiera('mysql_network', undef)
-#
 # [*principal*]
 #   (Optional) The haproxy service principal that is set for MySQL in kerberos.
 #   Defaults to undef
@@ -45,16 +40,11 @@ class tripleo::certmonger::mysql (
   $service_certificate,
   $service_key,
   $certmonger_ca = hiera('certmonger_ca', 'local'),
-  $mysql_network = hiera('mysql_network', undef),
   $principal     = undef,
 ) {
   include ::certmonger
   include ::mysql::params
 
-  if !$mysql_network {
-    fail('mysql_network is not set in the hieradata.')
-  }
-
   $postsave_cmd        = "systemctl reload ${::mysql::params::service_name}"
   certmonger_certificate { 'mysql' :
     ensure       => 'present',
diff --git a/manifests/haproxy/endpoint.pp b/manifests/haproxy/endpoint.pp
index 2f60b24..da2aba3 100644
--- a/manifests/haproxy/endpoint.pp
+++ b/manifests/haproxy/endpoint.pp
@@ -36,7 +36,7 @@
 #
 # [*public_virtual_ip*]
 #  Address in which the proxy endpoint will be listening in the public network.
-#  If this service is internal only this should be ommited.
+#  If this service is internal only this should be ommitted.
 #  Defaults to undef.
 #
 # [*mode*]
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index dae627c..fe1e6a6 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -110,6 +110,7 @@ class tripleo::profile::base::nova (
   }
 
   if $step >= 4 {
+    include ::nova::placement
     if $manage_migration {
       class { '::nova::migration::libvirt':
         configure_libvirt => $libvirt_enabled,
diff --git a/manifests/profile/base/nova/placement.pp b/manifests/profile/base/nova/placement.pp
index 7edd4e8..aa8c3c7 100644
--- a/manifests/profile/base/nova/placement.pp
+++ b/manifests/profile/base/nova/placement.pp
@@ -86,8 +86,6 @@ class tripleo::profile::base::nova::placement (
   }
 
   if $step >= 4 {
-    include ::nova::placement
-
     class { '::nova::wsgi::apache_placement':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
diff --git a/manifests/profile/base/octavia.pp b/manifests/profile/base/octavia.pp
new file mode 100644
index 0000000..46ca009
--- /dev/null
+++ b/manifests/profile/base/octavia.pp
@@ -0,0 +1,57 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: tripleo::profile::base::octavia
+#
+# Octavia server profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step of the deployment
+#   Defaults to hiera('step')
+#
+# [*rabbit_user*]
+# [*rabbit_password*]
+#  (Optional) RabbitMQ user details
+#  Defaults to undef
+#
+# [*rabbit_hosts*]
+#   list of the rabbbit host fqdns
+#   Defaults to hiera('rabbitmq_node_names')
+#
+# [*rabbit_port*]
+#   IP port for rabbitmq service
+#   Defaults to 5672.
+#
+class tripleo::profile::base::octavia (
+  $step            = hiera('step'),
+  $rabbit_user     = undef,
+  $rabbit_password = undef,
+  $rabbit_hosts    = hiera('rabbitmq_node_names', undef),
+  $rabbit_port     = '5672'
+) {
+  if $step >= 3 {
+    class { '::octavia' :
+      default_transport_url => os_transport_url({
+        'transport' => 'rabbit',
+        'hosts'     => $rabbit_hosts,
+        'port'      => sprintf('%s', $rabbit_port),
+        'username'  => $rabbit_user,
+        'password'  => $rabbit_password
+        })
+    }
+    include ::octavia::config
+  }
+}
diff --git a/manifests/profile/base/octavia/api.pp b/manifests/profile/base/octavia/api.pp
new file mode 100644
index 0000000..d457478
--- /dev/null
+++ b/manifests/profile/base/octavia/api.pp
@@ -0,0 +1,54 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: tripleo::profile::base::octavia::api
+#
+# Octavia API server profile for tripleo
+#
+# === Parameters
+#
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::octavia::api (
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $step           = hiera('step'),
+) {
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
+
+  include ::tripleo::profile::base::octavia
+
+  if $step >= 3 and $sync_db {
+    include ::octavia::db::mysql
+  }
+
+  # We start the Octavia API server on the bootstrap node first, because
+  # it will try to populate tables and we need to make sure this happens
+  # before it starts on other nodes
+  if ($step >= 4 and $sync_db) or ($step >= 5 and !$sync_db) {
+    class { '::octavia::api':
+      sync_db => $sync_db,
+    }
+  }
+}