delete blank lines and spaces
Change-Id: Ic97784225c0d55ee9f6b8747a35e5151d1b5c7ea
This commit is contained in:
parent
2792878658
commit
d0012814e1
|
@ -28,4 +28,3 @@ openstack::firewall::multi_net {'115 pcsd-server':
|
|||
source_nets => $corosync_networks,
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
hostname ospfd-idz
|
||||
password
|
||||
password
|
||||
!
|
||||
!
|
||||
interface lo
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
hostname ospfd-ipz
|
||||
password
|
||||
password
|
||||
!
|
||||
!
|
||||
interface lo
|
||||
|
|
|
@ -5,7 +5,7 @@ class plugin_detach_netnode::l3_quagga {
|
|||
Exec { path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' }
|
||||
|
||||
if $plugin_settings['l3_agent_quagga'] == true {
|
||||
|
||||
|
||||
package { "quagga":
|
||||
ensure => present,
|
||||
}
|
||||
|
|
|
@ -17,7 +17,7 @@ run_ping_checker: false
|
|||
colocate_haproxy: false
|
||||
corosync_roles: ['network-node', 'primary-network-node']
|
||||
neutron_primary_controller_roles: ['primary-network-node']
|
||||
neutron_nodes:
|
||||
neutron_nodes:
|
||||
<%= scope.function_hiera_hash(['network_metadata'])['nodes'].inject({}) {|res, (k, v)| res[v['name']] = v if (v['node_roles'] & ['controller','network-node','primary-network-node','primary-controller']).any?; res }.to_yaml.split('\n')[1..-1].join('\n') %>
|
||||
")
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
requires: ['deploy_start']
|
||||
required_for: ['network_node']
|
||||
tasks: [hiera, globals, tools, logging, netconfig, hosts, firewall, ssl-keys-saving, ssl-add-trust-chain, fuel_pkgs]
|
||||
parameters:
|
||||
parameters:
|
||||
timeout: 3600
|
||||
strategy:
|
||||
type: one_by_one
|
||||
|
@ -100,12 +100,12 @@
|
|||
requires: ['network_node_pre','network_node_override']
|
||||
required_for: ['deploy_end']
|
||||
tasks: [openstack-network-start, openstack-network-common-config, openstack-network-server-config, openstack-network-plugins-l2]
|
||||
parameters:
|
||||
parameters:
|
||||
timeout: 3600
|
||||
strategy:
|
||||
type: one_by_one
|
||||
- id: network_node_l3_agent
|
||||
type: puppet
|
||||
type: puppet
|
||||
version: 2.0.0
|
||||
role: ['/^(primary-)?network-node$/']
|
||||
requires: ['openstack-network-plugins-l2']
|
||||
|
|
Loading…
Reference in New Issue