openstack/puppet-openstack-integration
Code Issues Proposed changes

Update manifests to reduce Puppet warnings

Browse Source 
Update some parameters deprecations:
* neutron tunneling is now activated by default.
* zaqar has new parameters for keystone authtoken.

Change-Id: Ie18c1f5f600d014f61b6474ea7029cf86461e554
This commit is contained in:
Emilien Macchi 2016-08-09 15:34:52 -04:00
parent 528a35cf10
commit b8bb5827f9
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/neutron.pp
View File

@ -68,11 +68,10 @@ class openstack_integration::neutron (
refreshonly => true, refreshonly => true,
} }
class { '::neutron::agents::ml2::ovs': class { '::neutron::agents::ml2::ovs':
enable_tunneling => true, local_ip => '127.0.0.1',
local_ip => '127.0.0.1', tunnel_types => ['vxlan'],
tunnel_types => ['vxlan'], bridge_mappings => ['external:br-ex'],
bridge_mappings => ['external:br-ex'], manage_vswitch => false,
manage_vswitch => false,
} }
$firewall_driver = 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver' $firewall_driver = 'neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver'
} }

10
manifests/zaqar.pp
View File

@ -14,11 +14,13 @@ class openstack_integration::zaqar {
class {'::zaqar::messaging::mongodb': class {'::zaqar::messaging::mongodb':
uri => $zaqar_mongodb_conn_string uri => $zaqar_mongodb_conn_string
} }
class {'::zaqar::keystone::authtoken':
auth_url => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
password => 'a_big_secret',
}
class {'::zaqar': class {'::zaqar':
admin_password => 'a_big_secret', unreliable => true,
unreliable => true,
identity_uri => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
} }
Mongodb_replset['openstack'] -> Package['zaqar-common'] Mongodb_replset['openstack'] -> Package['zaqar-common']
include ::zaqar::server include ::zaqar::server