From e21c7416794f4669f8033f60ccd4ea9bab727022 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 10 Jun 2016 15:51:51 -0400 Subject: Drop extraconfig for neutron-opencontrail.yaml This patch drops the extraconfig interface in favor of using the composable services nested stack instead. The benefit is that it is easier to enable multiple services (like network and storage backends at the same time) and all of the opencontrail settings get to live in the same file. Partially-implements: blueprint composable-services-within-roles Change-Id: I0edbd86a8c981bd6e8a547cd2a6ebed18ecdbb31 --- environments/neutron-opencontrail.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'environments') diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml index 36354bc9..340bac78 100644 --- a/environments/neutron-opencontrail.yaml +++ b/environments/neutron-opencontrail.yaml @@ -1,7 +1,6 @@ # A Heat environment file which can be used to enable OpenContrail # extensions, configured via puppet resource_registry: - OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-opencontrail.yaml OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/neutron-opencontrail.yaml OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None OS::TripleO::Services::NeutronL3Agent: OS::Heat::None -- cgit 1.2.3-korg rates Unnamed repositoryGrokmirror user
aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/keepalived.yaml
blob: a258ee419fda9fbb86e436c2e6555a755530dcee (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86