x/fuel-plugin-contrail
Code Issues Proposed changes

Rename hiera override file

Browse Source 
By renaming we force hiera to be compatible with hiera_config

Change-Id: Id12b05f10c082b4b0c9380ff8b02a5f2d0851ca0
This commit is contained in:
Nikita Koshikov
2016-10-07 16:27:32 -07:00
parent 6562633614
commit dc2ddce38c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/modules/contrail/manifests/compute/compute_netconfig_override.pp
View File

@@ -24,7 +24,7 @@ class contrail::compute::compute_netconfig_override {
$contrail::phys_dev,
$contrail::compute_dpdk_enabled)
file { '/etc/hiera/plugins/contrail-vrouter-override_ns.yaml':
file { '/etc/hiera/plugins/100-contrail-vrouter-override_ns.yaml':
ensure => file,
content => inline_template('<%= YAML.dump @override_ns %>'),
replace => false,

4
deployment_scripts/puppet/modules/contrail/manifests/compute/hiera.pp
View File

@@ -21,9 +21,9 @@ class contrail::compute::hiera {
}
if roles_include('dpdk') {
file_line {'contrail-vrouter-override_ns':
file_line {'100-contrail-vrouter-override_ns':
path => '/etc/hiera.yaml',
line => ' - plugins/contrail-vrouter-override_ns',
line => ' - plugins/100-contrail-vrouter-override_ns',
after => ' !ruby/sym hierarchy:',
}
}