Merge "Fix syntax errors in the manifests" into stable/7.0
This commit is contained in:
commit
1a40ebf404
@ -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']
|
||||||
}
|
}
|
||||||
|
@ -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': }
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
Loading…
Reference in New Issue
Block a user