From cfeef81765598b111354958b6cb4900aa08eaff0 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 29 Mar 2016 20:54:54 -0400 Subject: [PATCH] scenario001: enable IPv6 on centos7 Allow to deploy scenario001 on IPv6 networks when running CentOS7 jobs: * ceilometer * aodh * gnocchi Change-Id: Ide911c1bf805860fe1bac0bf50da10b1f5528714 --- README.md | 2 +- fixtures/scenario001.pp | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5f8b6776e..cbe44eda0 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ scenario](#All-In-One). | - | scenario001 | scenario002 | scenario003 | scenario-aio | |:----------:|:-----------:|:-----------:|:-----------:|:-------------: | ssl | yes | yes | no | no | -| ipv6 | no | yes | no | no | +| ipv6 | centos7 | centos7 | no | no | | keystone | X | X | X | X | | glance | rbd | swift | file | file | | nova | rbd | X | X | X | diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index 2eeb65803..d52b5448a 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -14,9 +14,22 @@ # limitations under the License. # +case $::osfamily { + 'Debian': { + $ipv6 = false + } + 'RedHat': { + $ipv6 = true + } + default: { + fail("Unsupported osfamily (${::osfamily})") + } +} + include ::openstack_integration class { '::openstack_integration::config': - ssl => true, + ssl => true, + ipv6 => $ipv6, } include ::openstack_integration::cacert include ::openstack_integration::rabbitmq