Merge "Fix syntax errors in the manifests" into stable/7.0

This commit is contained in:
Jenkins 2016-09-07 12:34:12 +00:00 committed by Gerrit Code Review
commit 1a40ebf404
4 changed files with 2 additions and 4 deletions

View File

@ -234,5 +234,5 @@ class ceph::radosgw (
Exec["Populate ${radosgw_auth_key} keyring"] -> Exec["Populate ${radosgw_auth_key} keyring"] ->
File[$keyring_path] -> File[$keyring_path] ->
Firewall['012 RadosGW allow'] ~> Firewall['012 RadosGW allow'] ~>
Service ['httpd'] Service['httpd']
} }

View File

@ -344,7 +344,7 @@ class galera (
Service['mysql'] -> Service['mysql'] ->
Exec['wait-initial-sync'] -> Exec['wait-initial-sync'] ->
Exec['wait-for-synced-state'] -> Exec['wait-for-synced-state'] ->
Exec ['rm-init-file'] Exec['rm-init-file']
Package['MySQL-server'] ~> Exec['wait-initial-sync'] Package['MySQL-server'] ~> Exec['wait-initial-sync']
anchor {'database-cluster-done': } anchor {'database-cluster-done': }

View File

@ -128,7 +128,6 @@ class murano::keystone::auth(
$public_port = undef, $public_port = undef,
$public_protocol = undef, $public_protocol = undef,
$public_address = undef, $public_address = undef,
$public_port = undef,
$internal_protocol = undef, $internal_protocol = undef,
$internal_address = undef, $internal_address = undef,
$admin_protocol = undef, $admin_protocol = undef,

View File

@ -128,7 +128,6 @@ class sahara::keystone::auth(
$public_port = undef, $public_port = undef,
$public_protocol = undef, $public_protocol = undef,
$public_address = undef, $public_address = undef,
$public_port = undef,
$internal_protocol = undef, $internal_protocol = undef,
$internal_address = undef, $internal_address = undef,
$admin_protocol = undef, $admin_protocol = undef,