From b0dbb04cc86681e8f96591bc15f2eff9418515a5 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 4 Apr 2016 11:24:37 -0400
Subject: [PATCH] scenario003: enable IPv6 on centos7

On Centos7 jobs, deploy Heat, Trove, Horizon and Sahara on IPv6.

Change-Id: I0da97938d30e274656dff51967c4045e1e4818ab
---
 README.md               | 2 +-
 fixtures/scenario003.pp | 5 ++++-
 manifests/heat.pp       | 3 +++
 manifests/horizon.pp    | 1 -
 manifests/sahara.pp     | 1 +
 manifests/trove.pp      | 1 +
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index cf7c2ae9b..b54df279c 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ scenario](#All-In-One).
 |     -      | scenario001 | scenario002 | scenario003 | scenario-aio |
 |:----------:|:-----------:|:-----------:|:-----------:|:-------------:
 | ssl        |     yes     |      yes    |      yes    |      no      |
-| ipv6       |   centos7   |    centos7  |      no     |      no      |
+| ipv6       |   centos7   |    centos7  |    centos7  |      no      |
 | keystone   |      X      |       X     |       X     |       X      |
 | glance     |     rbd     |     swift   |     file    |     file     |
 | nova       |     rbd     |       X     |       X     |       X      |
diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index 8f381ea41..21056668a 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -16,11 +16,13 @@
 
 case $::osfamily {
   'Debian': {
+    $ipv6           = false
     # sahara is broken for Ubuntu Trusty and Debian
     # ConfigParser.NoSectionError: No section: 'alembic'
     $sahara_enabled = false
   }
   'RedHat': {
+    $ipv6           = true
     $sahara_enabled = true
   }
   default: {
@@ -30,7 +32,8 @@ case $::osfamily {
 
 include ::openstack_integration
 class { '::openstack_integration::config':
-  ssl => true,
+  ipv6 => $ipv6,
+  ssl  => true,
 }
 include ::openstack_integration::cacert
 include ::openstack_integration::rabbitmq
diff --git a/manifests/heat.pp b/manifests/heat.pp
index b3602f9bd..085666348 100644
--- a/manifests/heat.pp
+++ b/manifests/heat.pp
@@ -59,6 +59,7 @@ class openstack_integration::heat {
   Keystone_user_role['heat_admin::heat@::heat'] -> File['/root/openrc']
   class { '::heat::client': }
   class { '::heat::api':
+    bind_host => $::openstack_integration::config::host,
     workers   => '2',
     use_ssl   => $::openstack_integration::config::ssl,
     cert_file => $crt_file,
@@ -71,12 +72,14 @@ class openstack_integration::heat {
     heat_watch_server_url         => "${::openstack_integration::config::base_url}:8003",
   }
   class { '::heat::api_cloudwatch':
+    bind_host => $::openstack_integration::config::host,
     workers   => '2',
     use_ssl   => $::openstack_integration::config::ssl,
     cert_file => $crt_file,
     key_file  => $key_file,
   }
   class { '::heat::api_cfn':
+    bind_host => $::openstack_integration::config::host,
     workers   => '2',
     use_ssl   => $::openstack_integration::config::ssl,
     cert_file => $crt_file,
diff --git a/manifests/horizon.pp b/manifests/horizon.pp
index dcde51045..ad2bc0340 100644
--- a/manifests/horizon.pp
+++ b/manifests/horizon.pp
@@ -30,7 +30,6 @@ class openstack_integration::horizon {
 
   class { '::horizon':
     secret_key       => 'big_secret',
-    servername       => $::openstack_integration::config::ip_for_url,
     allowed_hosts    => $::openstack_integration::config::ip_for_url,
     listen_ssl       => $::openstack_integration::config::ssl,
     ssl_redirect     => $::openstack_integration::config::ssl,
diff --git a/manifests/sahara.pp b/manifests/sahara.pp
index 1079a0cab..a9a4c6ad3 100644
--- a/manifests/sahara.pp
+++ b/manifests/sahara.pp
@@ -29,6 +29,7 @@ class openstack_integration::sahara {
     password     => 'a_big_secret',
   }
   class { '::sahara':
+    host                => $::openstack_integration::config::host,
     database_connection => 'mysql+pymysql://sahara:sahara@127.0.0.1/sahara?charset=utf8',
     rabbit_userid       => 'sahara',
     rabbit_password     => 'an_even_bigger_secret',
diff --git a/manifests/trove.pp b/manifests/trove.pp
index 4fe2f9f0b..fcd798825 100644
--- a/manifests/trove.pp
+++ b/manifests/trove.pp
@@ -49,6 +49,7 @@ class openstack_integration::trove {
     admin_url    => "${::openstack_integration::config::base_url}:8779/v1.0/%(tenant_id)s",
   }
   class { '::trove::api':
+    bind_host         => $::openstack_integration::config::host,
     keystone_password => 'a_big_secret',
     auth_uri          => $::openstack_integration::config::keystone_auth_uri,
     identity_uri      => $::openstack_integration::config::keystone_admin_uri,