diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-31 14:53:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-31 14:53:56 +0000 |
| commit | 7903fc743bd3e445ef48c2d08a4bd3115f825e0b (patch) | |
| tree | c48d4f6ebf904c45b04def70813cdd35bd10bdf8 /puppet/hieradata | |
| parent | 9f45b39cd880980640cf369382dd92c35424e1ca (diff) | |
| parent | 655fd041ae283490a8d501ec13c06d8aabb0ced5 (diff) | |
Merge "Cleanup hieradata to reduce Puppet warnings"
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/common.yaml | 1 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 34965959..65cf9577 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -17,6 +17,7 @@ nova::network::neutron::neutron_username: 'neutron' nova::network::neutron::dhcp_domain: '' neutron::allow_overlapping_ips: true +neutron::server::project_name: 'service' kernel_modules: nf_conntrack: {} diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 81efa244..e07c84c6 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -143,6 +143,7 @@ heat::cron::purge_deleted::destination: '/dev/null' heat::keystone::domain::domain_name: 'heat_stack' heat::keystone::domain::domain_admin: 'heat_stack_domain_admin' heat::keystone::domain::domain_admin_email: 'heat_stack_domain_admin@localhost' +heat::auth_plugin: 'password' # pacemaker pacemaker::corosync::cluster_name: 'tripleo_cluster' |