From 9f3201ff2eaacf906dbb8717bcddaa73ea3cb43f Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 26 Oct 2016 09:25:58 -0600 Subject: [PATCH] Fix two puppet parse errors The ironic class and mariadb::services_remote classes had two parse errors which prevent their usage. This change fixes the parse errors so these classes can be used. Change-Id: I986492b7f6ebd3c1b66a59926e819b1ca4cdc5ad --- packstack/puppet/modules/packstack/manifests/ironic.pp | 2 +- .../modules/packstack/manifests/mariadb/services_remote.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/ironic.pp b/packstack/puppet/modules/packstack/manifests/ironic.pp index 2149c8be4..14da06b9d 100644 --- a/packstack/puppet/modules/packstack/manifests/ironic.pp +++ b/packstack/puppet/modules/packstack/manifests/ironic.pp @@ -6,7 +6,7 @@ class packstack::ironic () 'glance/glance_host': value => hiera('CONFIG_STORAGE_HOST_URL'); } - class { '::ironic::api::authtoken': { + class { '::ironic::api::authtoken': auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), password => hiera('CONFIG_IRONIC_KS_PW'), } diff --git a/packstack/puppet/modules/packstack/manifests/mariadb/services_remote.pp b/packstack/puppet/modules/packstack/manifests/mariadb/services_remote.pp index 08de32ad2..431b91b80 100644 --- a/packstack/puppet/modules/packstack/manifests/mariadb/services_remote.pp +++ b/packstack/puppet/modules/packstack/manifests/mariadb/services_remote.pp @@ -90,7 +90,7 @@ class packstack::mariadb::services_remote () { } } - if hiera('CONFIG_GNOCCHI_INSTALL') == 'y' and + if hiera('CONFIG_GNOCCHI_INSTALL') == 'y' { remote_database { 'gnocchi': ensure => 'present', charset => 'utf8',