openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "scenario001: enable IPv6 on centos7"

Browse Source
This commit is contained in:
Jenkins 2016-03-30 19:13:52 +00:00 committed by Gerrit Code Review
commit b3839c817e
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -34,7 +34,7 @@ scenario](#All-In-One).
| - | scenario001 | scenario002 | scenario003 | scenario-aio | | - | scenario001 | scenario002 | scenario003 | scenario-aio |
|:----------:|:-----------:|:-----------:|:-----------:|:-------------: |:----------:|:-----------:|:-----------:|:-----------:|:-------------:
| ssl | yes | yes | no | no | | ssl | yes | yes | no | no |
| ipv6 | no | yes | no | no | | ipv6 | centos7 | centos7 | no | no |
| keystone | X | X | X | X | | keystone | X | X | X | X |
| glance | rbd | swift | file | file | | glance | rbd | swift | file | file |
| nova | rbd | X | X | X | | nova | rbd | X | X | X |

15
fixtures/scenario001.pp
View File

@ -14,9 +14,22 @@
# limitations under the License. # limitations under the License.
# #
case $::osfamily {
'Debian': {
$ipv6 = false
}
'RedHat': {
$ipv6 = true
}
default: {
fail("Unsupported osfamily (${::osfamily})")
}
}
include ::openstack_integration include ::openstack_integration
class { '::openstack_integration::config': class { '::openstack_integration::config':
ssl => true, ssl => true,
ipv6 => $ipv6,
} }
include ::openstack_integration::cacert include ::openstack_integration::cacert
include ::openstack_integration::rabbitmq include ::openstack_integration::rabbitmq