1 From 373da7eae018f52097d96fe18898d035e53b354d Mon Sep 17 00:00:00 2001
2 From: Tim Rozet <tdrozet@gmail.com>
3 Date: Tue, 12 Jan 2016 16:49:57 -0500
4 Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support
7 environments/onos.yaml | 8 +
8 environments/opendaylight-external.yaml | 25 ++
9 environments/opendaylight.yaml | 25 ++
10 environments/opendaylight_l3.yaml | 9 +
11 environments/opendaylight_sdnvpn.yaml | 29 ++
12 environments/opendaylight_sfc.yaml | 28 ++
13 network/endpoints/endpoint_map.yaml | 31 ++
14 overcloud-resource-registry-puppet.yaml | 3 +
15 overcloud-without-mergepy.yaml | 93 +++++
16 puppet/all-nodes-config.yaml | 17 +
17 puppet/compute.yaml | 35 ++
18 puppet/controller.yaml | 93 ++++-
19 puppet/hieradata/common.yaml | 1 +
20 puppet/hieradata/controller.yaml | 5 +-
21 puppet/manifests/overcloud_compute.pp | 47 ++-
22 puppet/manifests/overcloud_controller.pp | 126 +++++-
23 puppet/manifests/overcloud_controller_pacemaker.pp | 456 ++++++++++++++-------
24 puppet/manifests/overcloud_opendaylight.pp | 27 ++
25 puppet/opendaylight-puppet.yaml | 223 ++++++++++
26 19 files changed, 1119 insertions(+), 162 deletions(-)
27 create mode 100644 environments/onos.yaml
28 create mode 100644 environments/opendaylight-external.yaml
29 create mode 100644 environments/opendaylight.yaml
30 create mode 100644 environments/opendaylight_l3.yaml
31 create mode 100644 environments/opendaylight_sdnvpn.yaml
32 create mode 100644 environments/opendaylight_sfc.yaml
33 create mode 100644 puppet/manifests/overcloud_opendaylight.pp
34 create mode 100644 puppet/opendaylight-puppet.yaml
36 diff --git a/environments/onos.yaml b/environments/onos.yaml
38 index 0000000..510aca9
40 +++ b/environments/onos.yaml
43 + #This a bug for odl deployment. Once bug fixed OpenDaylightCount can be remove.
44 + OpenDaylightCount: 0
47 + neutron_service_plugins: ['onos_router']
48 + neutron_mechanism_drivers: ['onos_ml2']
49 + neutron_tenant_network_type: vxlan
50 diff --git a/environments/opendaylight-external.yaml b/environments/opendaylight-external.yaml
52 index 0000000..411df21
54 +++ b/environments/opendaylight-external.yaml
56 +# Environment file used to enable OpenDaylight
57 +# Currently uses overcloud image that is assumed
58 +# to be virt-customized with ODL RPM already on it
60 +# These parameters customize the OpenDaylight Node
61 +# The user name and password are for the ODL service
62 +# Defaults are included here for reference
64 +# OpenDaylightFlavor: baremetal
65 +# OpenDaylightHostname: opendaylight-server
66 +# OpenDaylightImage: overcloud-full
67 +# OpenDaylightUsername: admin
68 +# OpenDaylightPassword: admin
71 + # increase this if you need more ODL nodes
72 + OpenDaylightCount: 1
75 + neutron_mechanism_drivers: ['opendaylight']
76 + neutron_tenant_network_type: vxlan
77 + # Enable this if you want OpenDaylight on the contollers
78 + # reduce OpenDaylightCount to 0 if you don't want any
79 + # OpenDaylight only nodes
80 + #opendaylight_install: true
81 diff --git a/environments/opendaylight.yaml b/environments/opendaylight.yaml
83 index 0000000..c8abf75
85 +++ b/environments/opendaylight.yaml
87 +# Environment file used to enable OpenDaylight
88 +# Currently uses overcloud image that is assumed
89 +# to be virt-customized with ODL RPM already on it
91 +# These parameters customize the OpenDaylight Node
92 +# The user name and password are for the ODL service
93 +# Defaults are included here for reference
95 +# OpenDaylightFlavor: baremetal
96 +# OpenDaylightHostname: opendaylight-server
97 +# OpenDaylightImage: overcloud-full
98 +# OpenDaylightUsername: admin
99 +# OpenDaylightPassword: admin
102 + # increase this if you need more ODL nodes
103 + # OpenDaylightCount: 1
106 + neutron_mechanism_drivers: ['opendaylight']
107 + neutron_tenant_network_type: vxlan
108 + # Enable this if you want OpenDaylight on the contollers
109 + # reduce OpenDaylightCount to 0 if you don't want any
110 + # OpenDaylight only nodes
111 + opendaylight_install: true
112 diff --git a/environments/opendaylight_l3.yaml b/environments/opendaylight_l3.yaml
114 index 0000000..05c0aff
116 +++ b/environments/opendaylight_l3.yaml
119 + #NeutronEnableL3Agent: false
120 + NeutronEnableForceMetadata: true
121 + OpenDaylightEnableL3: "'yes'"
122 + NeutronServicePlugins: "networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin"
124 + neutron_mechanism_drivers: ['opendaylight']
125 + neutron_tenant_network_type: vxlan
126 + opendaylight_install: true
127 diff --git a/environments/opendaylight_sdnvpn.yaml b/environments/opendaylight_sdnvpn.yaml
129 index 0000000..3a14975
131 +++ b/environments/opendaylight_sdnvpn.yaml
133 +# Environment file used to enable OpenDaylight
134 +# Currently uses overcloud image that is assumed
135 +# to be virt-customized with ODL RPM already on it
137 +# These parameters customize the OpenDaylight Node
138 +# The user name and password are for the ODL service
139 +# Defaults are included here for reference
140 +#parameter_defaults:
141 +# OpenDaylightFlavor: baremetal
142 +# OpenDaylightHostname: opendaylight-server
143 +# OpenDaylightImage: overcloud-full
144 +# OpenDaylightUsername: admin
145 +# OpenDaylightPassword: admin
148 + # increase this if you need more ODL nodes
149 + # OpenDaylightCount: 1
150 + ControllerEnableSwiftStorage: false
151 + OpenDaylightFeatures: "odl-ovsdb-openstack,odl-vpnservice-api,odl-vpnservice-impl,odl-vpnservice-impl-rest,odl-vpnservice-impl-ui,odl-vpnservice-core"
153 + NeutronServicePlugins: "router,qos,networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin"
155 + tripleo::ringbuilder::build_ring: False
156 + neutron_mechanism_drivers: ['opendaylight']
157 + neutron_tenant_network_type: vxlan
158 + # Enable this if you want OpenDaylight on the contollers
159 + # reduce OpenDaylightCount to 0 if you don't want any
160 + # OpenDaylight only nodes
161 + opendaylight_install: true
162 diff --git a/environments/opendaylight_sfc.yaml b/environments/opendaylight_sfc.yaml
164 index 0000000..3dd1e13
166 +++ b/environments/opendaylight_sfc.yaml
168 +# Environment file used to enable OpenDaylight
169 +# Currently uses overcloud image that is assumed
170 +# to be virt-customized with ODL RPM already on it
172 +# These parameters customize the OpenDaylight Node
173 +# The user name and password are for the ODL service
174 +# Defaults are included here for reference
175 +#parameter_defaults:
176 +# OpenDaylightFlavor: baremetal
177 +# OpenDaylightHostname: opendaylight-server
178 +# OpenDaylightImage: overcloud-full
179 +# OpenDaylightUsername: admin
180 +# OpenDaylightPassword: admin
183 + # increase this if you need more ODL nodes
184 + # OpenDaylightCount: 1
185 + ControllerEnableSwiftStorage: false
186 + OpenDaylightFeatures: "odl-ovsdb-sfc-rest"
189 + tripleo::ringbuilder::build_ring: False
190 + neutron_mechanism_drivers: ['opendaylight']
191 + neutron_tenant_network_type: vxlan
192 + # Enable this if you want OpenDaylight on the contollers
193 + # reduce OpenDaylightCount to 0 if you don't want any
194 + # OpenDaylight only nodes
195 + opendaylight_install: true
196 diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
197 index 0521401..7caa91b 100644
198 --- a/network/endpoints/endpoint_map.yaml
199 +++ b/network/endpoints/endpoint_map.yaml
200 @@ -4,6 +4,9 @@ description: >
201 A Map of OpenStack Endpoints
207 CeilometerApiVirtualIP:
210 @@ -43,6 +46,9 @@ parameters:
214 + AodhAdmin: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
215 + AodhInternal: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
216 + AodhPublic: {protocol: 'http', port: '8042', host: 'IP_ADDRESS'}
217 CeilometerAdmin: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
218 CeilometerInternal: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
219 CeilometerPublic: {protocol: 'http', port: '8777', host: 'IP_ADDRESS'}
220 @@ -83,6 +89,28 @@ parameters:
225 + type: OS::TripleO::Endpoint
227 + EndpointName: AodhInternal
228 + EndpointMap: { get_param: EndpointMap }
229 + CloudName: {get_param: CloudName}
230 + IP: {get_param: AodhApiVirtualIP}
232 + type: OS::TripleO::Endpoint
234 + EndpointName: AodhPublic
235 + EndpointMap: { get_param: EndpointMap }
236 + CloudName: {get_param: CloudName}
237 + IP: {get_param: PublicVirtualIP}
239 + type: OS::TripleO::Endpoint
241 + EndpointName: AodhAdmin
242 + EndpointMap: { get_param: EndpointMap }
243 + CloudName: {get_param: CloudName}
244 + IP: {get_param: AodhApiVirtualIP}
247 type: OS::TripleO::Endpoint
249 @@ -407,6 +435,9 @@ resources:
253 + AodhInternal: {get_attr: [ AodhInternal, endpoint] }
254 + AodhPublic: {get_attr: [ AodhPublic, endpoint] }
255 + AodhAdmin: {get_attr: [ AodhAdmin, endpoint] }
256 CeilometerInternal: {get_attr: [ CeilometerInternal, endpoint] }
257 CeilometerPublic: {get_attr: [ CeilometerPublic, endpoint] }
258 CeilometerAdmin: {get_attr: [ CeilometerAdmin, endpoint] }
259 diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
260 index 4cfed6b..adecc79 100644
261 --- a/overcloud-resource-registry-puppet.yaml
262 +++ b/overcloud-resource-registry-puppet.yaml
263 @@ -27,6 +27,9 @@ resource_registry:
264 # To disable, replace with firstboot/userdata_default.yaml
265 OS::TripleO::NodeAdminUserData: firstboot/userdata_heat_admin.yaml
267 + # This configures OpenDaylight to drive the network
268 + OS::TripleO::OpenDaylightNode: puppet/opendaylight-puppet.yaml
270 # Hooks for operator extra config
271 # NodeUserData == Cloud-init additional user-data, e.g cloud-config
272 # ControllerExtraConfigPre == Controller configuration pre service deployment
273 diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
274 index a532c2f..965ca4c 100644
275 --- a/overcloud-without-mergepy.yaml
276 +++ b/overcloud-without-mergepy.yaml
277 @@ -15,6 +15,11 @@ parameters:
278 description: The password for the keystone admin account, used for monitoring, querying neutron etc.
283 + description: The password for the aodh services
288 description: The ceilometer backend type.
289 @@ -113,6 +118,10 @@ parameters:
292 description: Neutron ID for ctlplane network.
293 + NeutronEnableForceMetadata:
295 + description: If True, DHCP always provides metadata route to VM.
297 NeutronEnableTunnelling:
300 @@ -227,6 +236,31 @@ parameters:
302 description: Should MongoDb journaling be disabled
306 + description: Set opendaylight service port
308 + OpenDaylightEnableL3:
309 + description: Knob to enable/disable ODL L3
312 + OpenDaylightFeatures:
313 + description: List of features to install with ODL
314 + type: comma_delimited_list
315 + default: "odl-ovsdb-openstack"
316 + OpenDaylightInstall:
318 + description: Whether to install OpenDaylight on the control nodes.
320 + OpenDaylightUsername:
322 + description: The username for the opendaylight server.
324 + OpenDaylightPassword:
327 + description: The password for the opendaylight server.
329 PublicVirtualFixedIPs:
332 @@ -575,6 +609,7 @@ parameters:
334 NeutronTenantNetwork: tenant
335 CeilometerApiNetwork: internal_api
336 + AodhApiNetwork: internal_api
337 MongoDbNetwork: internal_api
338 CinderApiNetwork: internal_api
339 CinderIscsiNetwork: storage
340 @@ -664,6 +699,18 @@ parameters:
341 structure as ExtraConfig.
344 +# OpenDaylight specific parameters
349 + default: overcloud-full
351 + OpenDaylightFlavor:
353 + description: Flavor for OpenDaylight node
356 # Hostname format for each role
357 # Note %index% is translated into the index of the node, e.g 0/1/2 etc
358 # and %stackname% is replaced with OS::stack_name in the template below.
359 @@ -688,6 +735,10 @@ parameters:
361 description: Format for CephStorage node hostnames
362 default: '%stackname%-cephstorage-%index%'
363 + OpenDaylightHostnameFormat:
365 + description: Format for OpenDaylight node hostnames
366 + default: '%stackname%-opendaylight-%index%'
368 # Identifiers to trigger tasks on nodes
370 @@ -758,6 +809,7 @@ resources:
372 CloudName: {get_param: CloudName}
373 CeilometerApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
374 + AodhApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, AodhApiNetwork]}]}
375 CinderApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
376 GlanceApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
377 GlanceRegistryVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
378 @@ -770,6 +822,29 @@ resources:
379 SwiftProxyVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
380 PublicVirtualIP: {get_attr: [VipMap, net_ip_map, external]}
383 + type: OS::Heat::ResourceGroup
384 + depends_on: Networks
386 + count: {get_param: OpenDaylightCount}
387 + removal_policies: {get_param: ComputeRemovalPolicies}
389 + type: OS::TripleO::OpenDaylightNode
391 + UpdateIdentifier: {get_param: UpdateIdentifier}
392 + OpenDaylightFlavor: {get_param: OpenDaylightFlavor}
393 + OpenDaylightImage: {get_param: OpenDaylightImage}
394 + OpenDaylightPort: {get_param: OpenDaylightPort}
395 + OpenDaylightUsername: {get_param: OpenDaylightUsername}
396 + OpenDaylightFeatures: {get_param: OpenDaylightFeatures}
397 + OpenDaylightPassword: {get_param: OpenDaylightPassword}
398 + OpenDaylightEnableL3: {get_param: OpenDaylightEnableL3}
399 + OpenDaylightHostname:
401 + template: {get_param: OpenDaylightHostnameFormat}
403 + '%stackname%': {get_param: 'OS::stack_name'}
406 type: OS::Heat::ResourceGroup
408 @@ -781,6 +856,7 @@ resources:
410 AdminPassword: {get_param: AdminPassword}
411 AdminToken: {get_param: AdminToken}
412 + AodhPassword: {get_param: AodhPassword}
413 CeilometerBackend: {get_param: CeilometerBackend}
414 CeilometerMeteringSecret: {get_param: CeilometerMeteringSecret}
415 CeilometerPassword: {get_param: CeilometerPassword}
416 @@ -832,6 +908,7 @@ resources:
417 NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
418 NeutronExternalNetworkBridge: {get_param: NeutronExternalNetworkBridge}
419 NeutronEnableTunnelling: {get_param: NeutronEnableTunnelling}
420 + NeutronEnableForceMetadata: {get_param: NeutronEnableForceMetadata}
421 NeutronNetworkVLANRanges: {get_param: NeutronNetworkVLANRanges}
422 NeutronPublicInterface: {get_param: NeutronPublicInterface}
423 NeutronPublicInterfaceDefaultRoute: {get_param: NeutronPublicInterfaceDefaultRoute}
424 @@ -853,6 +930,12 @@ resources:
425 NovaPassword: {get_param: NovaPassword}
426 NtpServer: {get_param: NtpServer}
427 MongoDbNoJournal: {get_param: MongoDbNoJournal}
428 + OpenDaylightPort: {get_param: OpenDaylightPort}
429 + OpenDaylightInstall: {get_param: OpenDaylightInstall}
430 + OpenDaylightUsername: {get_param: OpenDaylightUsername}
431 + OpenDaylightFeatures: {get_param: OpenDaylightFeatures}
432 + OpenDaylightPassword: {get_param: OpenDaylightPassword}
433 + OpenDaylightEnableL3: {get_param: OpenDaylightEnableL3}
434 PcsdPassword: {get_resource: PcsdPassword}
435 PublicVirtualInterface: {get_param: PublicVirtualInterface}
436 RabbitPassword: {get_param: RabbitPassword}
437 @@ -878,6 +961,7 @@ resources:
438 ServiceNetMap: {get_param: ServiceNetMap}
439 EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
440 CeilometerApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
441 + AodhApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, AodhApiNetwork]}]}
442 CinderApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
443 HeatApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
444 GlanceApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
445 @@ -948,6 +1032,9 @@ resources:
446 NovaPublicIP: {get_attr: [PublicVirtualIP, ip_address]}
447 NovaPassword: {get_param: NovaPassword}
448 NtpServer: {get_param: NtpServer}
449 + OpenDaylightPort: {get_param: OpenDaylightPort}
450 + OpenDaylightUsername: {get_param: OpenDaylightUsername}
451 + OpenDaylightPassword: {get_param: OpenDaylightPassword}
452 RabbitHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
453 RabbitPassword: {get_param: RabbitPassword}
454 RabbitUserName: {get_param: RabbitUserName}
455 @@ -1068,6 +1155,7 @@ resources:
456 compute_hosts: {get_attr: [Compute, hosts_entry]}
457 controller_hosts: {get_attr: [Controller, hosts_entry]}
458 controller_ips: {get_attr: [Controller, ip_address]}
459 + opendaylight_ip: {get_attr: [OpenDaylightNode, ip_address]}
460 block_storage_hosts: {get_attr: [BlockStorage, hosts_entry]}
461 object_storage_hosts: {get_attr: [ObjectStorage, hosts_entry]}
462 ceph_storage_hosts: {get_attr: [CephStorage, hosts_entry]}
463 @@ -1081,6 +1169,7 @@ resources:
464 heat_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
465 swift_proxy_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
466 ceilometer_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
467 + aodh_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, AodhApiNetwork]}]}
468 nova_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
469 nova_metadata_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, NovaMetadataNetwork]}]}
470 glance_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
471 @@ -1189,6 +1278,7 @@ resources:
472 nova_api_vip: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
473 nova_metadata_vip: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, NovaMetadataNetwork]}]}
474 ceilometer_api_vip: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
475 + aodh_api_vip: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, AodhApiNetwork]}]}
476 heat_api_vip: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
477 horizon_vip: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
478 redis_vip: {get_attr: [RedisVirtualIP, ip_address]}
479 @@ -1434,6 +1524,9 @@ outputs:
481 description: Controller VIP for public API endpoints
482 value: {get_attr: [PublicVirtualIP, ip_address]}
484 + description: VIP for Aodh API internal endpoint
485 + value: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, AodhApiNetwork]}]}
486 CeilometerInternalVip:
487 description: VIP for Ceilometer API internal endpoint
488 value: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
489 diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
490 index 2bc519b..d649ba0 100644
491 --- a/puppet/all-nodes-config.yaml
492 +++ b/puppet/all-nodes-config.yaml
493 @@ -8,6 +8,8 @@ parameters:
494 type: comma_delimited_list
496 type: comma_delimited_list
498 + type: comma_delimited_list
500 type: comma_delimited_list
501 object_storage_hosts:
502 @@ -34,6 +36,8 @@ parameters:
503 type: comma_delimited_list
504 ceilometer_api_node_ips:
505 type: comma_delimited_list
507 + type: comma_delimited_list
509 type: comma_delimited_list
510 nova_metadata_node_ips:
511 @@ -82,6 +86,10 @@ resources:
512 raw_data: {get_file: hieradata/RedHat.yaml}
515 + opendaylight_controller_ip:
518 + - {get_param: opendaylight_ip}
522 @@ -166,6 +174,14 @@ resources:
525 - {get_param: ceilometer_api_node_ips}
528 + template: "['SERVERS_LIST']"
533 + - {get_param: aodh_api_node_ips}
536 template: "['SERVERS_LIST']"
537 @@ -239,6 +255,7 @@ resources:
538 neutron::rabbit_hosts: *rabbit_nodes_array
539 nova::rabbit_hosts: *rabbit_nodes_array
540 keystone::rabbit_hosts: *rabbit_nodes_array
541 + aodh::rabbit_hosts: *rabbit_nodes_array
545 diff --git a/puppet/compute.yaml b/puppet/compute.yaml
546 index 70c7403..13fd4f6 100644
547 --- a/puppet/compute.yaml
548 +++ b/puppet/compute.yaml
549 @@ -213,6 +213,23 @@ parameters:
555 + description: Set opendaylight service port
557 + OpenDaylightUsername:
559 + description: The username for the opendaylight server.
561 + OpenDaylightPassword:
564 + description: The password for the opendaylight server.
568 + description: Set onos service port
572 default: '' # Has to be here because of the ignored empty value bug
573 @@ -320,6 +337,11 @@ resources:
575 ControlPlaneIP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
578 + type: OS::TripleO::Controller::Ports::ExternalPort
580 + ControlPlaneIP: {get_attr: [NovaCompute, networks, ctlplane, 0]}
583 type: OS::TripleO::Network::Ports::NetIpMap
585 @@ -327,6 +349,7 @@ resources:
586 InternalApiIp: {get_attr: [InternalApiPort, ip_address]}
587 StorageIp: {get_attr: [StoragePort, ip_address]}
588 TenantIp: {get_attr: [TenantPort, ip_address]}
589 + ExternalIp: {get_attr: [ExternalPort, ip_address]}
592 type: OS::TripleO::Compute::Net::SoftwareConfig
593 @@ -335,6 +358,7 @@ resources:
594 InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
595 StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
596 TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]}
597 + ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
600 type: OS::TripleO::SoftwareDeployment
601 @@ -406,6 +430,10 @@ resources:
602 neutron::rabbit_user: {get_input: rabbit_user}
603 neutron::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
604 neutron::rabbit_port: {get_input: rabbit_client_port}
605 + opendaylight_port: {get_input: opendaylight_port}
606 + opendaylight_username: {get_input: opendaylight_username}
607 + opendaylight_password: {get_input: opendaylight_password}
608 + onos_port: {get_input: onos_port}
609 neutron_flat_networks: {get_input: neutron_flat_networks}
610 neutron_host: {get_input: neutron_host}
611 neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
612 @@ -459,6 +487,10 @@ resources:
613 snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
614 snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
615 glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
616 + opendaylight_port: {get_param: OpenDaylightPort}
617 + opendaylight_username: {get_param: OpenDaylightUsername}
618 + opendaylight_password: {get_param: OpenDaylightPassword}
619 + onos_port: {get_param: ONOSPort}
620 neutron_flat_networks: {get_param: NeutronFlatNetworks}
621 neutron_host: {get_param: NeutronHost}
622 neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
623 @@ -570,6 +602,9 @@ outputs:
625 description: IP address of the server in the tenant network
626 value: {get_attr: [TenantPort, ip_address]}
627 + external_ip_address:
628 + description: IP address of the server in the external network
629 + value: {get_attr: [ExternalPort, ip_address]}
631 description: Hostname of the server
632 value: {get_attr: [NovaCompute, name]}
633 diff --git a/puppet/controller.yaml b/puppet/controller.yaml
634 index ea0b3af..bd82e93 100644
635 --- a/puppet/controller.yaml
636 +++ b/puppet/controller.yaml
637 @@ -14,6 +14,14 @@ parameters:
638 description: The keystone auth secret and db password.
646 + description: The password for the aodh services.
649 CeilometerApiVirtualIP:
652 @@ -357,6 +365,10 @@ parameters:
654 description: Allow automatic l3-agent failover
656 + NeutronEnableForceMetadata:
658 + description: If True, DHCP always provides metadata route to VM.
660 NeutronEnableTunnelling:
663 @@ -443,6 +455,35 @@ parameters:
669 + description: Set opendaylight service port
671 + OpenDaylightInstall:
673 + description: Whether to install OpenDaylight on the control nodes.
675 + OpenDaylightUsername:
677 + description: The username for the opendaylight server.
679 + OpenDaylightPassword:
682 + description: The password for the opendaylight server.
684 + OpenDaylightEnableL3:
685 + description: Knob to enable/disable ODL L3
688 + OpenDaylightFeatures:
689 + description: List of features to install with ODL
690 + type: comma_delimited_list
691 + default: "odl-ovsdb-openstack"
694 + description: Set onos service port
698 description: The password for the 'pcsd' user.
699 @@ -696,6 +737,7 @@ resources:
701 bootstack_nodeid: {get_attr: [Controller, name]}
702 neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
703 + neutron_enable_force_metadata: {get_param: NeutronEnableForceMetadata}
704 haproxy_log_address: {get_param: HAProxySyslogAddress}
705 heat.watch_server_url:
707 @@ -774,6 +816,7 @@ resources:
708 - {get_param: MysqlVirtualIP}
710 keystone_ca_certificate: {get_param: KeystoneCACertificate}
711 + keystone_admin_vip: {get_param: KeystoneAdminApiVirtualIP}
712 keystone_signing_key: {get_param: KeystoneSigningKey}
713 keystone_signing_certificate: {get_param: KeystoneSigningCertificate}
714 keystone_ssl_certificate: {get_param: KeystoneSSLCertificate}
715 @@ -805,6 +848,13 @@ resources:
716 template: tripleo-CLUSTER
718 CLUSTER: {get_param: MysqlClusterUniquePart}
719 + opendaylight_port: {get_param: OpenDaylightPort}
720 + opendaylight_install: {get_param: OpenDaylightInstall}
721 + opendaylight_username: {get_param: OpenDaylightUsername}
722 + opendaylight_password: {get_param: OpenDaylightPassword}
723 + opendaylight_enable_l3: {get_param: OpenDaylightEnableL3}
724 + opendaylight_features: {get_param: OpenDaylightFeatures}
725 + onos_port: {get_param: ONOSPort}
726 neutron_flat_networks: {get_param: NeutronFlatNetworks}
727 neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
728 neutron_agent_mode: {get_param: NeutronAgentMode}
729 @@ -879,6 +929,7 @@ resources:
730 ceilometer_backend: {get_param: CeilometerBackend}
731 ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
732 ceilometer_password: {get_param: CeilometerPassword}
733 + aodh_password: {get_param: AodhPassword}
734 ceilometer_coordination_url:
737 @@ -891,6 +942,12 @@ resources:
738 - - 'mysql://ceilometer:unset@'
739 - {get_param: MysqlVirtualIP}
741 + ceilometer_public_url: {get_param: [EndpointMap, CeilometerPublic, uri]}
742 + ceilometer_internal_url: {get_param: [EndpointMap, CeilometerInternal, uri]}
743 + ceilometer_admin_url: {get_param: [EndpointMap, CeilometerAdmin, uri]}
744 + aodh_public_url: {get_param: [EndpointMap, AodhPublic, uri]}
745 + aodh_internal_url: {get_param: [EndpointMap, AodhInternal, uri]}
746 + aodh_admin_url: {get_param: [EndpointMap, AodhAdmin, uri]}
747 snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
748 snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
749 nova_password: {get_param: NovaPassword}
750 @@ -948,6 +1005,7 @@ resources:
751 neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
752 neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
753 ceilometer_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
754 + aodh_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, AodhApiNetwork]}]}
755 nova_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
756 nova_metadata_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaMetadataNetwork]}]}
757 horizon_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
758 @@ -1041,7 +1099,7 @@ resources:
759 cinder_iscsi_ip_address: {get_input: cinder_iscsi_network}
760 cinder::database_connection: {get_input: cinder_dsn}
761 cinder::api::keystone_password: {get_input: cinder_password}
762 - cinder::api::auth_uri: {get_input: keystone_auth_uri}
763 + cinder::api::keystone_auth_host: {get_input: keystone_admin_vip}
764 cinder::api::identity_uri: {get_input: keystone_identity_uri}
765 cinder::api::bind_host: {get_input: cinder_api_network}
766 cinder::rabbit_userid: {get_input: rabbit_username}
767 @@ -1136,6 +1194,17 @@ resources:
768 mysql_bind_host: {get_input: mysql_network}
769 mysql_virtual_ip: {get_input: mysql_virtual_ip}
772 + opendaylight_port: {get_input: opendaylight_port}
773 + opendaylight_install: {get_input: opendaylight_install}
774 + opendaylight_username: {get_input: opendaylight_username}
775 + opendaylight_password: {get_input: opendaylight_password}
776 + opendaylight_enable_l3: {get_input: opendaylight_enable_l3}
777 + opendaylight_features: {get_input: opendaylight_features}
780 + onos_port: {get_input: onos_port}
783 neutron::bind_host: {get_input: neutron_api_network}
784 neutron::rabbit_password: {get_input: rabbit_password}
785 @@ -1152,6 +1221,7 @@ resources:
786 neutron_flat_networks: {get_input: neutron_flat_networks}
787 neutron::agents::metadata::shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
788 neutron::agents::metadata::metadata_ip: {get_input: neutron_api_network}
789 + neutron::agents::dhcp::enable_force_metadata: {get_input: neutron_enable_force_metadata}
790 neutron_agent_mode: {get_input: neutron_agent_mode}
791 neutron_router_distributed: {get_input: neutron_router_distributed}
792 neutron::core_plugin: {get_input: neutron_core_plugin}
793 @@ -1198,6 +1268,27 @@ resources:
794 snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
795 snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
798 + aodh::rabbit_userid: {get_input: rabbit_username}
799 + aodh::rabbit_password: {get_input: rabbit_password}
800 + aodh::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
801 + aodh::rabbit_port: {get_input: rabbit_client_port}
802 + aodh::debug: {get_input: debug}
803 + aodh::wsgi::apache::ssl: false
804 + aodh::api::service_name: 'httpd'
805 + aodh::api::host: {get_input: aodh_api_network}
806 + aodh::api::keystone_password: {get_input: aodh_password}
807 + aodh::api::keystone_auth_uri: {get_input: keystone_auth_uri}
808 + aodh::api::keystone_identity_uri: {get_input: keystone_identity_uri}
809 + aodh::auth::auth_password: {get_input: aodh_password}
810 + aodh::keystone::auth::public_url: {get_input: aodh_public_url }
811 + aodh::keystone::auth::internal_url: {get_input: aodh_internal_url }
812 + aodh::keystone::auth::admin_url: {get_input: aodh_admin_url }
813 + aodh::keystone::auth::password: {get_input: aodh_password }
814 + aodh::keystone::auth::region: {get_input: keystone_region}
815 + # for a migration path from ceilometer-alarm to aodh, we use the same database & coordination
816 + aodh::evaluator::coordination_url: {get_input: ceilometer_coordination_url}
819 nova::rabbit_userid: {get_input: rabbit_username}
820 nova::rabbit_password: {get_input: rabbit_password}
821 diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
822 index 030f661..5840016 100644
823 --- a/puppet/hieradata/common.yaml
824 +++ b/puppet/hieradata/common.yaml
825 @@ -6,6 +6,7 @@ ceilometer::agent::auth::auth_region: 'regionOne'
826 # FIXME: Might be better to use 'service' tenant here but this requires
827 # changes in the tripleo-incubator keystone role setup
828 ceilometer::agent::auth::auth_tenant_name: 'admin'
829 +aodh::auth::auth_tenant_name: 'admin'
831 nova::network::neutron::neutron_admin_tenant_name: 'service'
832 nova::network::neutron::neutron_admin_username: 'neutron'
833 diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
834 index 4b7fd81..7dbc2e9 100644
835 --- a/puppet/hieradata/controller.yaml
836 +++ b/puppet/hieradata/controller.yaml
837 @@ -32,6 +32,7 @@ redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
839 nova::api::admin_tenant_name: 'service'
840 glance::api::keystone_tenant: 'service'
841 +aodh::api::keystone_tenant: 'service'
842 glance::registry::keystone_tenant: 'service'
843 neutron::server::auth_tenant: 'service'
844 neutron::agents::metadata::auth_tenant: 'service'
845 @@ -39,6 +40,7 @@ cinder::api::keystone_tenant: 'service'
846 swift::proxy::authtoken::admin_tenant_name: 'service'
847 ceilometer::api::keystone_tenant: 'service'
848 heat::keystone_tenant: 'service'
849 +aodh::keystone::auth::tenant: 'service'
852 keystone::cron::token_flush::maxdelay: 3600
853 @@ -72,7 +74,7 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
856 nova::notify_on_state_change: 'vm_and_task_state'
857 -nova::api::default_floating_pool: 'public'
858 +nova::api::default_floating_pool: 'external'
859 nova::api::osapi_v3: true
860 nova::scheduler::filter::ram_allocation_ratio: '1.0'
862 @@ -115,6 +117,7 @@ tripleo::loadbalancer::mysql: true
863 tripleo::loadbalancer::redis: true
864 tripleo::loadbalancer::swift_proxy_server: true
865 tripleo::loadbalancer::ceilometer: true
866 +tripleo::loadbalancer::aodh: true
867 tripleo::loadbalancer::heat_api: true
868 tripleo::loadbalancer::heat_cloudwatch: true
869 tripleo::loadbalancer::heat_cfn: true
870 diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
871 index cd41cc7..b6dc2fe 100644
872 --- a/puppet/manifests/overcloud_compute.pp
873 +++ b/puppet/manifests/overcloud_compute.pp
874 @@ -75,9 +75,50 @@ class { '::neutron::plugins::ml2':
875 tenant_network_types => [hiera('neutron_tenant_network_type')],
878 -class { '::neutron::agents::ml2::ovs':
879 - bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
880 - tunnel_types => split(hiera('neutron_tunnel_types'), ','),
881 +if 'opendaylight' in hiera('neutron_mechanism_drivers') {
883 + if str2bool(hiera('opendaylight_install', 'false')) {
884 + $controller_ips = split(hiera('controller_node_ips'), ',')
885 + $opendaylight_controller_ip = $controller_ips[0]
887 + $opendaylight_controller_ip = hiera('opendaylight_controller_ip')
890 + # co-existence hacks for SFC
891 + if hiera('opendaylight_features', 'odl-ovsdb-openstack') =~ /odl-ovsdb-sfc-rest/ {
892 + $opendaylight_port = hiera('opendaylight_port')
893 + $odl_username = hiera('opendaylight_username')
894 + $odl_password = hiera('opendaylight_password')
895 + $sfc_coexist_url = "http://${opendaylight_controller_ip}:${opendaylight_port}/restconf/config/sfc-of-renderer:sfc-of-renderer-config"
897 + exec { 'Check SFC table offset has been set':
898 + command => "curl --fail --silent -u ${odl_username}:${odl_password} ${sfc_coexist_url} | grep :11 > /dev/null",
901 + path => '/usr/sbin:/usr/bin:/sbin:/bin',
902 + before => Class['neutron::plugins::ovs::opendaylight'],
906 + class { 'neutron::plugins::ovs::opendaylight':
907 + odl_controller_ip => $opendaylight_controller_ip,
908 + tunnel_ip => hiera('neutron::agents::ml2::ovs::local_ip'),
909 + odl_port => hiera('opendaylight_port'),
910 + odl_username => hiera('opendaylight_username'),
911 + odl_password => hiera('opendaylight_password'),
914 +} elsif 'onos_ml2' in hiera('neutron_mechanism_drivers') {
915 + $controller_ips = split(hiera('controller_node_ips'), ',')
916 + class {'onos::ovs_computer':
917 + manager_ip => $controller_ips[0]
921 + class { 'neutron::agents::ml2::ovs':
922 + bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
923 + tunnel_types => split(hiera('neutron_tunnel_types'), ','),
927 if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
928 diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
929 index 1f6c2be..67a9f04 100644
930 --- a/puppet/manifests/overcloud_controller.pp
931 +++ b/puppet/manifests/overcloud_controller.pp
932 @@ -30,6 +30,21 @@ if hiera('step') >= 1 {
934 if hiera('step') >= 2 {
936 + if str2bool(hiera('opendaylight_install', 'false')) {
937 + class {"opendaylight":
938 + extra_features => any2array(hiera('opendaylight_features', 'odl-ovsdb-openstack')),
939 + odl_rest_port => hiera('opendaylight_port'),
940 + enable_l3 => hiera('opendaylight_enable_l3', 'no'),
944 + if 'onos_ml2' in hiera('neutron_mechanism_drivers') {
945 + # install onos and config ovs
947 + controllers_ip => $controller_node_ips
951 if count(hiera('ntp::servers')) > 0 {
954 @@ -158,6 +173,9 @@ if hiera('step') >= 2 {
956 if hiera('step') >= 3 {
963 #TODO: need a cleanup-keystone-tokens.sh solution here
964 @@ -223,9 +241,7 @@ if hiera('step') >= 3 {
965 include ::nova::scheduler
966 include ::nova::scheduler::filter
969 include ::neutron::server
970 - include ::neutron::agents::l3
971 include ::neutron::agents::dhcp
972 include ::neutron::agents::metadata
974 @@ -237,15 +253,99 @@ if hiera('step') >= 3 {
975 require => Package['neutron'],
978 + if 'onos_ml2' in hiera('neutron_mechanism_drivers') {
979 + # config neutron service_plugins to onos driver
980 + class { '::neutron':
981 + service_plugins => [hiera('neutron_service_plugins')]
985 + if ! ('opendaylight' in hiera('neutron_mechanism_drivers')) or ! str2bool(hiera('opendaylight_enable_l3', 'no')) {
986 + include ::neutron::agents::l3
990 class { '::neutron::plugins::ml2':
991 flat_networks => split(hiera('neutron_flat_networks'), ','),
992 tenant_network_types => [hiera('neutron_tenant_network_type')],
993 mechanism_drivers => [hiera('neutron_mechanism_drivers')],
995 - class { '::neutron::agents::ml2::ovs':
996 - bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
997 - tunnel_types => split(hiera('neutron_tunnel_types'), ','),
999 + if 'opendaylight' in hiera('neutron_mechanism_drivers') {
1000 + if ! str2bool(hiera('opendaylight_enable_l3', 'no')) {
1001 + Service['neutron-server'] -> Service['neutron-l3']
1004 + if str2bool(hiera('opendaylight_install', 'false')) {
1005 + $controller_ips = split(hiera('controller_node_ips'), ',')
1006 + $opendaylight_controller_ip = $controller_ips[0]
1008 + $opendaylight_controller_ip = hiera('opendaylight_controller_ip')
1011 + # co-existence hacks for SFC
1012 + if hiera('opendaylight_features', 'odl-ovsdb-openstack') =~ /odl-ovsdb-sfc-rest/ {
1013 + $opendaylight_port = hiera('opendaylight_port')
1014 + $netvirt_coexist_url = "http://${opendaylight_controller_ip}:${opendaylight_port}/restconf/config/netvirt-providers-config:netvirt-providers-config"
1015 + $netvirt_post_body = "{'netvirt-providers-config': {'table-offset': 1}}"
1016 + $sfc_coexist_url = "http://${opendaylight_controller_ip}:${opendaylight_port}/restconf/config/sfc-of-renderer:sfc-of-renderer-config"
1017 + $sfc_post_body = "{ 'sfc-of-renderer-config' : { 'sfc-of-table-offset' : 150, 'sfc-of-app-egress-table-offset' : 11 }}"
1018 + $odl_username = hiera('opendaylight_username')
1019 + $odl_password = hiera('opendaylight_password')
1020 + exec { 'Coexistence table offsets for netvirt':
1021 + command => "curl -o /dev/null --fail --silent -u ${odl_username}:${odl_password} ${netvirt_coexist_url} -i -H 'Content-Type: application/json' --data \'${netvirt_post_body}\' -X PUT",
1024 + path => '/usr/sbin:/usr/bin:/sbin:/bin',
1027 + exec { 'Coexistence table offsets for sfc':
1028 + command => "curl -o /dev/null --fail --silent -u ${odl_username}:${odl_password} ${sfc_coexist_url} -i -H 'Content-Type: application/json' --data \'${sfc_post_body}\' -X PUT",
1031 + path => '/usr/sbin:/usr/bin:/sbin:/bin',
1035 + class { 'neutron::plugins::ml2::opendaylight':
1036 + odl_controller_ip => $opendaylight_controller_ip,
1037 + odl_username => hiera('opendaylight_username'),
1038 + odl_password => hiera('opendaylight_password'),
1039 + odl_port => hiera('opendaylight_port'),
1042 + if str2bool(hiera('opendaylight_install', 'false')) {
1043 + class { 'neutron::plugins::ovs::opendaylight':
1044 + odl_controller_ip => $opendaylight_controller_ip,
1045 + tunnel_ip => hiera('neutron::agents::ml2::ovs::local_ip'),
1046 + odl_port => hiera('opendaylight_port'),
1047 + odl_username => hiera('opendaylight_username'),
1048 + odl_password => hiera('opendaylight_password'),
1052 + } elsif 'onos_ml2' in hiera('neutron_mechanism_drivers') {
1053 + #config ml2_conf.ini with onos url address
1054 + $onos_port = hiera('onos_port')
1055 + $private_ip = hiera('neutron::agents::ml2::ovs::local_ip')
1057 + neutron_plugin_ml2 {
1058 + 'onos/username': value => 'admin';
1059 + 'onos/password': value => 'admin';
1060 + 'onos/url_path': value => "http://${controller_node_ips[0]}:${onos_port}/onos/vtn";
1065 + class { 'neutron::agents::ml2::ovs':
1066 + bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
1067 + tunnel_types => split(hiera('neutron_tunnel_types'), ','),
1070 + Service['neutron-server'] -> Service['neutron-ovs-agent-service']
1071 + Service['neutron-server'] -> Service['neutron-l3']
1074 if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') {
1075 include ::neutron::plugins::ml2::cisco::nexus1000v
1077 @@ -280,8 +380,6 @@ if hiera('step') >= 3 {
1080 Service['neutron-server'] -> Service['neutron-dhcp-service']
1081 - Service['neutron-server'] -> Service['neutron-l3']
1082 - Service['neutron-server'] -> Service['neutron-ovs-agent-service']
1083 Service['neutron-server'] -> Service['neutron-metadata']
1086 @@ -447,6 +545,20 @@ if hiera('step') >= 3 {
1088 Cron <| title == 'ceilometer-expirer' |> { command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" }
1091 + include ::aodh::auth
1092 + include ::aodh::api
1093 + include ::aodh::evaluator
1094 + include ::aodh::notifier
1095 + include ::aodh::listener
1096 + include ::aodh::client
1097 + include ::aodh::db::sync
1098 + class { '::aodh' :
1099 + database_connection => $ceilometer_database_connection,
1101 + # To manage the upgrade:
1102 + Exec['ceilometer-dbsync'] -> Exec['aodh-db-sync']
1107 diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
1108 index 3fb92f3..cb00e9a 100644
1109 --- a/puppet/manifests/overcloud_controller_pacemaker.pp
1110 +++ b/puppet/manifests/overcloud_controller_pacemaker.pp
1111 @@ -380,6 +380,21 @@ if hiera('step') >= 2 {
1115 + if str2bool(hiera('opendaylight_install', 'false')) {
1116 + class {"opendaylight":
1117 + extra_features => any2array(hiera('opendaylight_features', 'odl-ovsdb-openstack')),
1118 + odl_rest_port => hiera('opendaylight_port'),
1119 + enable_l3 => hiera('opendaylight_enable_l3', 'no'),
1123 + if 'onos_ml2' in hiera('neutron_mechanism_drivers') {
1124 + # install onos and config ovs
1126 + controllers_ip => $controller_node_ips
1130 exec { 'galera-ready' :
1131 command => '/usr/bin/clustercheck >/dev/null',
1133 @@ -584,7 +599,14 @@ if hiera('step') >= 3 {
1134 include ::nova::network::neutron
1136 # Neutron class definitions
1138 + if 'onos_ml2' in hiera('neutron_mechanism_drivers') {
1139 + # config neutron service_plugins to onos driver
1140 + class { '::neutron':
1141 + service_plugins => [hiera('neutron_service_plugins')]
1146 class { '::neutron::server' :
1147 sync_db => $sync_db,
1148 manage_service => false,
1149 @@ -594,10 +616,6 @@ if hiera('step') >= 3 {
1150 manage_service => false,
1153 - class { '::neutron::agents::l3' :
1154 - manage_service => false,
1157 class { '::neutron::agents::metadata':
1158 manage_service => false,
1160 @@ -609,18 +627,80 @@ if hiera('step') >= 3 {
1161 notify => Service['neutron-dhcp-service'],
1162 require => Package['neutron'],
1166 + if ('networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin' in hiera('neutron::service_plugins'))
1168 + class { 'neutron::config':
1169 + server_config => {
1170 + 'service_providers/service_provider' => {
1171 + 'value' => 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
1177 class { '::neutron::plugins::ml2':
1178 flat_networks => split(hiera('neutron_flat_networks'), ','),
1179 tenant_network_types => [hiera('neutron_tenant_network_type')],
1180 mechanism_drivers => [hiera('neutron_mechanism_drivers')],
1182 - class { '::neutron::agents::ml2::ovs':
1183 - manage_service => false,
1185 - bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
1186 - tunnel_types => split(hiera('neutron_tunnel_types'), ','),
1188 + if 'opendaylight' in hiera('neutron_mechanism_drivers') {
1189 + if str2bool(hiera('opendaylight_install', 'false')) {
1190 + $controller_ips = split(hiera('controller_node_ips'), ',')
1191 + $opendaylight_controller_ip = $controller_ips[0]
1193 + $opendaylight_controller_ip = hiera('opendaylight_controller_ip')
1196 + $opendaylight_port = hiera('opendaylight_port')
1197 + $private_ip = hiera('neutron::agents::ml2::ovs::local_ip')
1199 + class { 'neutron::plugins::ml2::opendaylight':
1200 + odl_controller_ip => $opendaylight_controller_ip,
1201 + odl_username => hiera('opendaylight_username'),
1202 + odl_password => hiera('opendaylight_password'),
1203 + odl_port => hiera('opendaylight_port'),
1206 + if str2bool(hiera('opendaylight_install', 'false')) {
1207 + class { 'neutron::plugins::ovs::opendaylight':
1208 + odl_controller_ip => $opendaylight_controller_ip,
1209 + tunnel_ip => hiera('neutron::agents::ml2::ovs::local_ip'),
1210 + odl_port => hiera('opendaylight_port'),
1211 + odl_username => hiera('opendaylight_username'),
1212 + odl_password => hiera('opendaylight_password'),
1215 + if ! str2bool(hiera('opendaylight_enable_l3', 'no')) {
1216 + class { '::neutron::agents::l3' :
1217 + manage_service => false,
1221 + } elsif 'onos_ml2' in hiera('neutron_mechanism_drivers') {
1222 + #config ml2_conf.ini with onos url address
1223 + $onos_port = hiera('onos_port')
1224 + $private_ip = hiera('neutron::agents::ml2::ovs::local_ip')
1226 + neutron_plugin_ml2 {
1227 + 'onos/username': value => 'admin';
1228 + 'onos/password': value => 'admin';
1229 + 'onos/url_path': value => "http://${controller_node_ips[0]}:${onos_port}/onos/vtn";
1233 + class { '::neutron::agents::l3' :
1234 + manage_service => false,
1237 + class { 'neutron::agents::ml2::ovs':
1238 + manage_service => false,
1240 + bridge_mappings => split(hiera('neutron_bridge_mappings'), ','),
1241 + tunnel_types => split(hiera('neutron_tunnel_types'), ','),
1244 if 'cisco_ucsm' in hiera('neutron_mechanism_drivers') {
1245 include ::neutron::plugins::ml2::cisco::ucsm
1247 @@ -645,8 +725,10 @@ if hiera('step') >= 3 {
1248 if hiera('neutron_enable_bigswitch_ml2', false) {
1249 include ::neutron::plugins::ml2::bigswitch::restproxy
1251 - neutron_l3_agent_config {
1252 - 'DEFAULT/ovs_use_veth': value => hiera('neutron_ovs_use_veth', false);
1253 + if !('onos_ml2' in hiera('neutron_mechanism_drivers') or str2bool(hiera('opendaylight_enable_l3', 'no'))) {
1254 + neutron_l3_agent_config {
1255 + 'DEFAULT/ovs_use_veth': value => hiera('neutron_ovs_use_veth', false);
1258 neutron_dhcp_agent_config {
1259 'DEFAULT/ovs_use_veth': value => hiera('neutron_ovs_use_veth', false);
1260 @@ -813,13 +895,13 @@ if hiera('step') >= 3 {
1261 swift::storage::filter::healthcheck { $swift_components : }
1264 + $mongo_node_string = join($mongo_node_ips_with_port, ',')
1266 case downcase(hiera('ceilometer_backend')) {
1268 $ceilometer_database_connection = hiera('ceilometer_mysql_conn_string')
1271 - $mongo_node_string = join($mongo_node_ips_with_port, ',')
1272 $ceilometer_database_connection = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}"
1275 @@ -879,6 +961,62 @@ if hiera('step') >= 3 {
1279 + $aodh_database_connection = "mongodb://${mongo_node_string}/aodh?replicaSet=${mongodb_replset}"
1281 + class { '::aodh::db':
1282 + database_connection => $aodh_database_connection
1287 + include ::aodh::config
1288 + include ::aodh::auth
1289 + include ::aodh::client
1290 + class { '::aodh::api':
1291 + manage_service => false,
1294 + class { '::aodh::evaluator':
1295 + manage_service => false,
1298 + class { '::aodh::notifier':
1299 + manage_service => false,
1302 + class { '::aodh::listener':
1303 + manage_service => false,
1307 + $event_pipeline = "---
1309 + - name: event_source
1315 + - name: event_sink
1319 + - notifier://?topic=alarm.all
1324 + file { '/etc/ceilometer/event_pipeline.yaml':
1325 + ensure => present,
1326 + content => $event_pipeline
1330 + groups => 'nobody'
1335 # httpd/apache and horizon
1336 # NOTE(gfidente): server-status can be consumed by the pacemaker resource agent
1337 class { '::apache' :
1338 @@ -1055,62 +1193,21 @@ if hiera('step') >= 4 {
1339 clone_params => 'interleave=true',
1340 require => Pacemaker::Resource::Service[$::keystone::params::service_name],
1342 - pacemaker::resource::service { $::neutron::params::l3_agent_service:
1343 - clone_params => 'interleave=true',
1344 + if !('onos_ml2' in hiera('neutron_mechanism_drivers')) {
1345 + pacemaker::resource::service { $::neutron::params::l3_agent_service:
1346 + clone_params => 'interleave=true',
1349 pacemaker::resource::service { $::neutron::params::dhcp_agent_service:
1350 clone_params => 'interleave=true',
1352 - pacemaker::resource::service { $::neutron::params::ovs_agent_service:
1353 - clone_params => 'interleave=true',
1355 pacemaker::resource::service { $::neutron::params::metadata_agent_service:
1356 clone_params => 'interleave=true',
1358 - pacemaker::resource::ocf { $::neutron::params::ovs_cleanup_service:
1359 - ocf_agent_name => 'neutron:OVSCleanup',
1360 - clone_params => 'interleave=true',
1362 pacemaker::resource::ocf { 'neutron-netns-cleanup':
1363 ocf_agent_name => 'neutron:NetnsCleanup',
1364 clone_params => 'interleave=true',
1367 - # neutron - one chain ovs-cleanup-->netns-cleanup-->ovs-agent
1368 - pacemaker::constraint::base { 'neutron-ovs-cleanup-to-netns-cleanup-constraint':
1369 - constraint_type => 'order',
1370 - first_resource => "${::neutron::params::ovs_cleanup_service}-clone",
1371 - second_resource => 'neutron-netns-cleanup-clone',
1372 - first_action => 'start',
1373 - second_action => 'start',
1374 - require => [Pacemaker::Resource::Ocf[$::neutron::params::ovs_cleanup_service],
1375 - Pacemaker::Resource::Ocf['neutron-netns-cleanup']],
1377 - pacemaker::constraint::colocation { 'neutron-ovs-cleanup-to-netns-cleanup-colocation':
1378 - source => 'neutron-netns-cleanup-clone',
1379 - target => "${::neutron::params::ovs_cleanup_service}-clone",
1380 - score => 'INFINITY',
1381 - require => [Pacemaker::Resource::Ocf[$::neutron::params::ovs_cleanup_service],
1382 - Pacemaker::Resource::Ocf['neutron-netns-cleanup']],
1384 - pacemaker::constraint::base { 'neutron-netns-cleanup-to-openvswitch-agent-constraint':
1385 - constraint_type => 'order',
1386 - first_resource => 'neutron-netns-cleanup-clone',
1387 - second_resource => "${::neutron::params::ovs_agent_service}-clone",
1388 - first_action => 'start',
1389 - second_action => 'start',
1390 - require => [Pacemaker::Resource::Ocf['neutron-netns-cleanup'],
1391 - Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service]],
1393 - pacemaker::constraint::colocation { 'neutron-netns-cleanup-to-openvswitch-agent-colocation':
1394 - source => "${::neutron::params::ovs_agent_service}-clone",
1395 - target => 'neutron-netns-cleanup-clone',
1396 - score => 'INFINITY',
1397 - require => [Pacemaker::Resource::Ocf['neutron-netns-cleanup'],
1398 - Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service]],
1401 - #another chain keystone-->neutron-server-->ovs-agent-->dhcp-->l3
1402 pacemaker::constraint::base { 'keystone-to-neutron-server-constraint':
1403 constraint_type => 'order',
1404 first_resource => "${::keystone::params::service_name}-clone",
1405 @@ -1120,65 +1217,110 @@ if hiera('step') >= 4 {
1406 require => [Pacemaker::Resource::Service[$::keystone::params::service_name],
1407 Pacemaker::Resource::Service[$::neutron::params::server_service]],
1409 - pacemaker::constraint::base { 'neutron-server-to-openvswitch-agent-constraint':
1410 - constraint_type => 'order',
1411 - first_resource => "${::neutron::params::server_service}-clone",
1412 - second_resource => "${::neutron::params::ovs_agent_service}-clone",
1413 - first_action => 'start',
1414 - second_action => 'start',
1415 - require => [Pacemaker::Resource::Service[$::neutron::params::server_service],
1416 - Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service]],
1418 - pacemaker::constraint::base { 'neutron-openvswitch-agent-to-dhcp-agent-constraint':
1419 - constraint_type => 'order',
1420 - first_resource => "${::neutron::params::ovs_agent_service}-clone",
1421 - second_resource => "${::neutron::params::dhcp_agent_service}-clone",
1422 - first_action => 'start',
1423 - second_action => 'start',
1424 - require => [Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service],
1425 - Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service]],
1426 + if 'openvswitch' in hiera('neutron_mechanism_drivers') {
1427 + pacemaker::resource::service { $::neutron::params::ovs_agent_service:
1428 + clone_params => "interleave=true",
1430 + pacemaker::resource::ocf { $::neutron::params::ovs_cleanup_service:
1431 + ocf_agent_name => "neutron:OVSCleanup",
1432 + clone_params => "interleave=true",
1434 + # neutron - one chain ovs-cleanup-->netns-cleanup-->ovs-agent
1435 + pacemaker::constraint::base { 'neutron-ovs-cleanup-to-netns-cleanup-constraint':
1436 + constraint_type => "order",
1437 + first_resource => "${::neutron::params::ovs_cleanup_service}-clone",
1438 + second_resource => "neutron-netns-cleanup-clone",
1439 + first_action => "start",
1440 + second_action => "start",
1441 + require => [Pacemaker::Resource::Ocf["${::neutron::params::ovs_cleanup_service}"],
1442 + Pacemaker::Resource::Ocf['neutron-netns-cleanup']],
1444 + pacemaker::constraint::colocation { 'neutron-ovs-cleanup-to-netns-cleanup-colocation':
1445 + source => "neutron-netns-cleanup-clone",
1446 + target => "${::neutron::params::ovs_cleanup_service}-clone",
1447 + score => "INFINITY",
1448 + require => [Pacemaker::Resource::Ocf["${::neutron::params::ovs_cleanup_service}"],
1449 + Pacemaker::Resource::Ocf['neutron-netns-cleanup']],
1451 + pacemaker::constraint::base { 'neutron-netns-cleanup-to-openvswitch-agent-constraint':
1452 + constraint_type => "order",
1453 + first_resource => "neutron-netns-cleanup-clone",
1454 + second_resource => "${::neutron::params::ovs_agent_service}-clone",
1455 + first_action => "start",
1456 + second_action => "start",
1457 + require => [Pacemaker::Resource::Ocf["neutron-netns-cleanup"],
1458 + Pacemaker::Resource::Service["${::neutron::params::ovs_agent_service}"]],
1460 + pacemaker::constraint::colocation { 'neutron-netns-cleanup-to-openvswitch-agent-colocation':
1461 + source => "${::neutron::params::ovs_agent_service}-clone",
1462 + target => "neutron-netns-cleanup-clone",
1463 + score => "INFINITY",
1464 + require => [Pacemaker::Resource::Ocf["neutron-netns-cleanup"],
1465 + Pacemaker::Resource::Service["${::neutron::params::ovs_agent_service}"]],
1468 + #another chain keystone-->neutron-server-->ovs-agent-->dhcp-->l3
1469 + pacemaker::constraint::base { 'neutron-server-to-openvswitch-agent-constraint':
1470 + constraint_type => "order",
1471 + first_resource => "${::neutron::params::server_service}-clone",
1472 + second_resource => "${::neutron::params::ovs_agent_service}-clone",
1473 + first_action => "start",
1474 + second_action => "start",
1475 + require => [Pacemaker::Resource::Service[$::neutron::params::server_service],
1476 + Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service]],
1478 + pacemaker::constraint::base { 'neutron-openvswitch-agent-to-dhcp-agent-constraint':
1479 + constraint_type => "order",
1480 + first_resource => "${::neutron::params::ovs_agent_service}-clone",
1481 + second_resource => "${::neutron::params::dhcp_agent_service}-clone",
1482 + first_action => "start",
1483 + second_action => "start",
1484 + require => [Pacemaker::Resource::Service["${::neutron::params::ovs_agent_service}"],
1485 + Pacemaker::Resource::Service["${::neutron::params::dhcp_agent_service}"]],
1488 + pacemaker::constraint::colocation { 'neutron-openvswitch-agent-to-dhcp-agent-colocation':
1489 + source => "${::neutron::params::dhcp_agent_service}-clone",
1490 + target => "${::neutron::params::ovs_agent_service}-clone",
1491 + score => "INFINITY",
1492 + require => [Pacemaker::Resource::Service["${::neutron::params::ovs_agent_service}"],
1493 + Pacemaker::Resource::Service["${::neutron::params::dhcp_agent_service}"]],
1496 - pacemaker::constraint::colocation { 'neutron-openvswitch-agent-to-dhcp-agent-colocation':
1497 - source => "${::neutron::params::dhcp_agent_service}-clone",
1498 - target => "${::neutron::params::ovs_agent_service}-clone",
1499 - score => 'INFINITY',
1500 - require => [Pacemaker::Resource::Service[$::neutron::params::ovs_agent_service],
1501 - Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service]],
1503 - pacemaker::constraint::base { 'neutron-dhcp-agent-to-l3-agent-constraint':
1504 - constraint_type => 'order',
1505 - first_resource => "${::neutron::params::dhcp_agent_service}-clone",
1506 - second_resource => "${::neutron::params::l3_agent_service}-clone",
1507 - first_action => 'start',
1508 - second_action => 'start',
1509 - require => [Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service],
1510 - Pacemaker::Resource::Service[$::neutron::params::l3_agent_service]],
1512 - pacemaker::constraint::colocation { 'neutron-dhcp-agent-to-l3-agent-colocation':
1513 - source => "${::neutron::params::l3_agent_service}-clone",
1514 - target => "${::neutron::params::dhcp_agent_service}-clone",
1515 - score => 'INFINITY',
1516 - require => [Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service],
1517 - Pacemaker::Resource::Service[$::neutron::params::l3_agent_service]],
1519 - pacemaker::constraint::base { 'neutron-l3-agent-to-metadata-agent-constraint':
1520 - constraint_type => 'order',
1521 - first_resource => "${::neutron::params::l3_agent_service}-clone",
1522 - second_resource => "${::neutron::params::metadata_agent_service}-clone",
1523 - first_action => 'start',
1524 - second_action => 'start',
1525 - require => [Pacemaker::Resource::Service[$::neutron::params::l3_agent_service],
1526 - Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service]],
1528 - pacemaker::constraint::colocation { 'neutron-l3-agent-to-metadata-agent-colocation':
1529 - source => "${::neutron::params::metadata_agent_service}-clone",
1530 - target => "${::neutron::params::l3_agent_service}-clone",
1531 - score => 'INFINITY',
1532 - require => [Pacemaker::Resource::Service[$::neutron::params::l3_agent_service],
1533 - Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service]],
1534 + if !('onos_ml2' in hiera('neutron_mechanism_drivers') or str2bool(hiera('opendaylight_enable_l3', 'no'))) {
1535 + pacemaker::constraint::base { 'neutron-dhcp-agent-to-l3-agent-constraint':
1536 + constraint_type => 'order',
1537 + first_resource => "${::neutron::params::dhcp_agent_service}-clone",
1538 + second_resource => "${::neutron::params::l3_agent_service}-clone",
1539 + first_action => 'start',
1540 + second_action => 'start',
1541 + require => [Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service],
1542 + Pacemaker::Resource::Service[$::neutron::params::l3_agent_service]],
1544 + pacemaker::constraint::colocation { 'neutron-dhcp-agent-to-l3-agent-colocation':
1545 + source => "${::neutron::params::l3_agent_service}-clone",
1546 + target => "${::neutron::params::dhcp_agent_service}-clone",
1547 + score => 'INFINITY',
1548 + require => [Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service],
1549 + Pacemaker::Resource::Service[$::neutron::params::l3_agent_service]],
1551 + pacemaker::constraint::base { 'neutron-l3-agent-to-metadata-agent-constraint':
1552 + constraint_type => 'order',
1553 + first_resource => "${::neutron::params::l3_agent_service}-clone",
1554 + second_resource => "${::neutron::params::metadata_agent_service}-clone",
1555 + first_action => 'start',
1556 + second_action => 'start',
1557 + require => [Pacemaker::Resource::Service[$::neutron::params::l3_agent_service],
1558 + Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service]],
1560 + pacemaker::constraint::colocation { 'neutron-l3-agent-to-metadata-agent-colocation':
1561 + source => "${::neutron::params::metadata_agent_service}-clone",
1562 + target => "${::neutron::params::l3_agent_service}-clone",
1563 + score => 'INFINITY',
1564 + require => [Pacemaker::Resource::Service[$::neutron::params::l3_agent_service],
1565 + Pacemaker::Resource::Service[$::neutron::params::metadata_agent_service]],
1570 pacemaker::resource::service { $::nova::params::api_service_name :
1571 clone_params => 'interleave=true',
1572 @@ -1276,7 +1418,7 @@ if hiera('step') >= 4 {
1573 Pacemaker::Resource::Service[$::nova::params::conductor_service_name]],
1577 + # Ceilometer and Aodh
1578 case downcase(hiera('ceilometer_backend')) {
1580 pacemaker::resource::service { $::ceilometer::params::agent_central_service_name :
1581 @@ -1298,10 +1440,19 @@ if hiera('step') >= 4 {
1582 pacemaker::resource::service { $::ceilometer::params::api_service_name :
1583 clone_params => 'interleave=true',
1585 - pacemaker::resource::service { $::ceilometer::params::alarm_evaluator_service_name :
1586 + pacemaker::resource::service { $::aodh::params::notifier_service_name :
1587 clone_params => 'interleave=true',
1589 - pacemaker::resource::service { $::ceilometer::params::alarm_notifier_service_name :
1590 + pacemaker::resource::service { $::aodh::params::expirer_package_serice :
1591 + clone_params => 'interleave=true',
1593 + pacemaker::resource::service { $::aodh::params::listener_service_name :
1594 + clone_params => 'interleave=true',
1596 + pacemaker::resource::service { $::aodh::params::api_service_name :
1597 + clone_params => 'interleave=true',
1599 + pacemaker::resource::service { $::aodh::params::evaluator_service_name :
1600 clone_params => 'interleave=true',
1602 pacemaker::resource::service { $::ceilometer::params::agent_notification_service_name :
1603 @@ -1315,8 +1466,19 @@ if hiera('step') >= 4 {
1604 # Fedora doesn't know `require-all` parameter for constraints yet
1605 if $::operatingsystem == 'Fedora' {
1606 $redis_ceilometer_constraint_params = undef
1607 + $redis_aodh_constraint_params = undef
1609 $redis_ceilometer_constraint_params = 'require-all=false'
1610 + $redis_aodh_constraint_params = 'require-all=false'
1612 + pacemaker::constraint::base { 'keystone-then-aodh-api-constraint':
1613 + constraint_type => 'order',
1614 + first_resource => "${::keystone::params::service_name}-clone",
1615 + second_resource => "${::aodh::params::api_service_name}-clone",
1616 + first_action => 'start',
1617 + second_action => 'start',
1618 + require => [Pacemaker::Resource::Service[$::aodh::params::api_service_name],
1619 + Pacemaker::Resource::Service[$::keystone::params::service_name]],
1621 pacemaker::constraint::base { 'redis-then-ceilometer-central-constraint':
1622 constraint_type => 'order',
1623 @@ -1328,6 +1490,16 @@ if hiera('step') >= 4 {
1624 require => [Pacemaker::Resource::Ocf['redis'],
1625 Pacemaker::Resource::Service[$::ceilometer::params::agent_central_service_name]],
1627 + pacemaker::constraint::base { 'redis-then-aodh-evaluator-constraint':
1628 + constraint_type => 'order',
1629 + first_resource => 'redis-master',
1630 + second_resource => "${::aodh::params::evaluator_service_name}-clone",
1631 + first_action => 'promote',
1632 + second_action => 'start',
1633 + constraint_params => $redis_aodh_constraint_params,
1634 + require => [Pacemaker::Resource::Ocf['redis'],
1635 + Pacemaker::Resource::Service[$::aodh::params::evaluator_service_name]],
1637 pacemaker::constraint::base { 'keystone-then-ceilometer-central-constraint':
1638 constraint_type => 'order',
1639 first_resource => "${::keystone::params::service_name}-clone",
1640 @@ -1378,53 +1550,37 @@ if hiera('step') >= 4 {
1641 require => [Pacemaker::Resource::Service[$::ceilometer::params::api_service_name],
1642 Pacemaker::Resource::Ocf['delay']],
1644 - pacemaker::constraint::base { 'ceilometer-delay-then-ceilometer-alarm-evaluator-constraint':
1645 + pacemaker::constraint::base { 'aodh-delay-then-aodh-evaluator-constraint':
1646 constraint_type => 'order',
1647 first_resource => 'delay-clone',
1648 - second_resource => "${::ceilometer::params::alarm_evaluator_service_name}-clone",
1649 + second_resource => "${::aodh::params::evaluator_service_name}-clone",
1650 first_action => 'start',
1651 second_action => 'start',
1652 - require => [Pacemaker::Resource::Service[$::ceilometer::params::alarm_evaluator_service_name],
1653 + require => [Pacemaker::Resource::Service[$::aodh::params::evaluator_service_name],
1654 Pacemaker::Resource::Ocf['delay']],
1656 - pacemaker::constraint::colocation { 'ceilometer-alarm-evaluator-with-ceilometer-delay-colocation':
1657 - source => "${::ceilometer::params::alarm_evaluator_service_name}-clone",
1658 + pacemaker::constraint::colocation { 'aodh-evaluator-with-aodh-delay-colocation':
1659 + source => "${::aodh::params::evaluator_service_name}-clone",
1660 target => 'delay-clone',
1661 score => 'INFINITY',
1662 - require => [Pacemaker::Resource::Service[$::ceilometer::params::api_service_name],
1663 + require => [Pacemaker::Resource::Service[$::horizon::params::http_service],
1664 Pacemaker::Resource::Ocf['delay']],
1666 - pacemaker::constraint::base { 'ceilometer-alarm-evaluator-then-ceilometer-alarm-notifier-constraint':
1667 - constraint_type => 'order',
1668 - first_resource => "${::ceilometer::params::alarm_evaluator_service_name}-clone",
1669 - second_resource => "${::ceilometer::params::alarm_notifier_service_name}-clone",
1670 - first_action => 'start',
1671 - second_action => 'start',
1672 - require => [Pacemaker::Resource::Service[$::ceilometer::params::alarm_evaluator_service_name],
1673 - Pacemaker::Resource::Service[$::ceilometer::params::alarm_notifier_service_name]],
1675 - pacemaker::constraint::colocation { 'ceilometer-alarm-notifier-with-ceilometer-alarm-evaluator-colocation':
1676 - source => "${::ceilometer::params::alarm_notifier_service_name}-clone",
1677 - target => "${::ceilometer::params::alarm_evaluator_service_name}-clone",
1678 - score => 'INFINITY',
1679 - require => [Pacemaker::Resource::Service[$::ceilometer::params::alarm_evaluator_service_name],
1680 - Pacemaker::Resource::Service[$::ceilometer::params::alarm_notifier_service_name]],
1682 - pacemaker::constraint::base { 'ceilometer-alarm-notifier-then-ceilometer-notification-constraint':
1683 + pacemaker::constraint::base { 'aodh-evaluator-then-aodh-notifier-constraint':
1684 constraint_type => 'order',
1685 - first_resource => "${::ceilometer::params::alarm_notifier_service_name}-clone",
1686 - second_resource => "${::ceilometer::params::agent_notification_service_name}-clone",
1687 + first_resource => "${::aodh::params::evaluator_service_name}-clone",
1688 + second_resource => "${::aodh::params::notifier_service_name}-clone",
1689 first_action => 'start',
1690 second_action => 'start',
1691 - require => [Pacemaker::Resource::Service[$::ceilometer::params::agent_notification_service_name],
1692 - Pacemaker::Resource::Service[$::ceilometer::params::alarm_notifier_service_name]],
1693 + require => [Pacemaker::Resource::Service[$::aodh::params::evaluator_service_name],
1694 + Pacemaker::Resource::Service[$::aodh::params::notifier_service_name]],
1696 - pacemaker::constraint::colocation { 'ceilometer-notification-with-ceilometer-alarm-notifier-colocation':
1697 - source => "${::ceilometer::params::agent_notification_service_name}-clone",
1698 - target => "${::ceilometer::params::alarm_notifier_service_name}-clone",
1699 + pacemaker::constraint::colocation { 'aodh-notifier-with-aodh-evaluator-colocation':
1700 + source => "${::aodh::params::notifier_service_name}-clone",
1701 + target => "${::aodh::params::evaluator_service_name}-clone",
1702 score => 'INFINITY',
1703 - require => [Pacemaker::Resource::Service[$::ceilometer::params::agent_notification_service_name],
1704 - Pacemaker::Resource::Service[$::ceilometer::params::alarm_notifier_service_name]],
1705 + require => [Pacemaker::Resource::Service[$::aodh::params::evaluator_service_name],
1706 + Pacemaker::Resource::Service[$::aodh::params::notifier_service_name]],
1708 if downcase(hiera('ceilometer_backend')) == 'mongodb' {
1709 pacemaker::constraint::base { 'mongodb-then-ceilometer-central-constraint':
1710 diff --git a/puppet/manifests/overcloud_opendaylight.pp b/puppet/manifests/overcloud_opendaylight.pp
1711 new file mode 100644
1712 index 0000000..aeb31be
1714 +++ b/puppet/manifests/overcloud_opendaylight.pp
1716 +# Copyright 2015 Red Hat, Inc.
1717 +# All Rights Reserved.
1719 +# Licensed under the Apache License, Version 2.0 (the "License"); you may
1720 +# not use this file except in compliance with the License. You may obtain
1721 +# a copy of the License at
1723 +# http://www.apache.org/licenses/LICENSE-2.0
1725 +# Unless required by applicable law or agreed to in writing, software
1726 +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
1727 +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
1728 +# License for the specific language governing permissions and limitations
1729 +# under the License.
1731 +include ::tripleo::packages
1733 +if count(hiera('ntp::servers')) > 0 {
1737 +class {"opendaylight":
1738 + extra_features => any2array(hiera('opendaylight_features', 'odl-ovsdb-openstack')),
1739 + odl_rest_port => hiera('opendaylight_port'),
1740 + enable_l3 => hiera('opendaylight_enable_l3', 'no'),
1743 diff --git a/puppet/opendaylight-puppet.yaml b/puppet/opendaylight-puppet.yaml
1744 new file mode 100644
1745 index 0000000..6488e0e
1747 +++ b/puppet/opendaylight-puppet.yaml
1749 +heat_template_version: 2015-04-30
1752 + OpenDaylight node configured by Puppet.
1755 + OpenDaylightFlavor:
1756 + default: baremetal
1757 + description: The flavor to use for the OpenDaylight node
1759 + OpenDaylightImage:
1760 + default: overcloud-full
1761 + description: The image to use for the OpenDaylight node
1763 + OpenDaylightHostname:
1764 + default: opendaylight-server
1765 + description: The hostname to use for the OpenDaylight node
1767 + OpenDaylightUsername:
1769 + description: The admin user for the OpenDaylight node
1771 + OpenDaylightPassword:
1773 + description: The admin password for the OpenDaylight node
1776 + OpenDaylightEnableL3:
1777 + description: Knob to enable/disable ODL L3
1780 + OpenDaylightFeatures:
1781 + description: List of features to install with ODL
1782 + type: comma_delimited_list
1783 + default: "odl-ovsdb-openstack"
1786 + description: Set OpenDaylight service port
1789 + description: The keypair to use for SSH access to the node (via heat-admin user)
1793 + - custom_constraint: nova.keypair
1794 + ImageUpdatePolicy:
1795 + default: 'REBUILD_PRESERVE_EPHEMERAL'
1796 + description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
1802 + Setting to a previously unused value during stack-update will trigger
1803 + package update on all nodes
1809 + description: What interface to bridge onto br-ex for network nodes.
1814 + type: OS::Nova::Server
1816 + image: {get_param: OpenDaylightImage}
1817 + image_update_policy: {get_param: ImageUpdatePolicy}
1818 + flavor: {get_param: OpenDaylightFlavor}
1819 + key_name: {get_param: KeyName}
1821 + - network: ctlplane
1822 + user_data_format: SOFTWARE_CONFIG
1823 + user_data: {get_resource: NodeUserData}
1824 + name: {get_param: OpenDaylightHostname}
1827 + type: OS::TripleO::NodeUserData
1830 + type: OS::TripleO::Controller::Ports::ExternalPort
1832 + ControlPlaneIP: {get_attr: [OpenDaylightNode, networks, ctlplane, 0]}
1835 + type: OS::TripleO::Controller::Ports::InternalApiPort
1837 + ControlPlaneIP: {get_attr: [OpenDaylightNode, networks, ctlplane, 0]}
1840 + type: OS::TripleO::Network::Ports::NetIpMap
1842 + ControlPlaneIp: {get_attr: [OpenDaylightNode, networks, ctlplane, 0]}
1843 + ExternalIp: {get_attr: [ExternalPort, ip_address]}
1844 + InternalApiIp: {get_attr: [InternalApiPort, ip_address]}
1847 + type: OS::TripleO::Network::Ports::NetIpSubnetMap
1849 + ControlPlaneIp: {get_attr: [OpenDaylightNode, networks, ctlplane, 0]}
1850 + ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
1851 + InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
1854 + type: OS::TripleO::Controller::Net::SoftwareConfig
1856 + ControlPlaneIp: {get_attr: [OpenDaylightNode, networks, ctlplane, 0]}
1857 + ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
1858 + InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
1860 + NetworkDeployment:
1861 + type: OS::TripleO::SoftwareDeployment
1863 + config: {get_resource: NetworkConfig}
1864 + server: {get_resource: OpenDaylightNode}
1866 + bridge_name: br-ex
1867 + interface_name: {get_param: PublicInterface}
1869 + OpenDaylightDeployment:
1870 + type: OS::TripleO::SoftwareDeployment
1871 + depends_on: NetworkDeployment
1873 + config: {get_resource: OpenDaylightConfig}
1874 + server: {get_resource: OpenDaylightNode}
1878 + template: '["server"]'
1880 + server: {get_param: NtpServer}
1881 + opendaylight_port: {get_param: OpenDaylightPort}
1882 + opendaylight_enable_l3: {get_param: OpenDaylightEnableL3}
1883 + opendaylight_username: {get_param: OpenDaylightUsername}
1884 + opendaylight_password: {get_param: OpenDaylightPassword}
1885 + opendaylight_features: {get_param: OpenDaylightFeatures}
1887 + OpenDaylightConfig:
1888 + type: OS::Heat::StructuredConfig
1890 + group: os-apply-config
1895 + - heat_config_%{::deploy_config_name}
1897 + - bootstrap_node # provided by BootstrapNodeConfig
1898 + - all_nodes # provided by allNodesConfig
1899 + - vip_data # provided by vip-config
1900 + - RedHat # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1236143
1904 + raw_data: {get_file: hieradata/common.yaml}
1906 + ntp::servers: {get_input: ntp_servers}
1907 + opendaylight::admin_username: {get_param: OpenDaylightUsername}
1908 + opendaylight::admin_password: {get_param: OpenDaylightPassword}
1909 + opendaylight_port: {get_input: opendaylight_port}
1910 + opendaylight_enable_l3: {get_input: opendaylight_enable_l3}
1911 + opendaylight_features: {get_input: opendaylight_features}
1913 + raw_data: {get_file: hieradata/ceph.yaml}
1916 + type: OS::TripleO::Tasks::PackageUpdate
1919 + type: OS::Heat::SoftwareDeployment
1921 + config: {get_resource: UpdateConfig}
1922 + server: {get_resource: OpenDaylightNode}
1924 + update_identifier:
1925 + get_param: UpdateIdentifier
1927 + OpenDaylightHostsConfig:
1928 + type: OS::Heat::SoftwareConfig
1932 + #!/usr/bin/env bash
1933 + echo -e "$(facter ipaddress)\t\t$(hostname -f)\t$(hostname -s)" >> /etc/hosts
1935 + OpenDaylightHostsDeployment:
1936 + type: OS::Heat::StructuredDeployment
1937 + depends_on: OpenDaylightDeployment
1939 + server: {get_resource: OpenDaylightNode}
1940 + config: {get_resource: OpenDaylightHostsConfig}
1942 + OpenDaylightPuppetConfig:
1943 + type: OS::Heat::SoftwareConfig
1947 + get_file: manifests/overcloud_opendaylight.pp
1949 + OpenDaylightPuppetDeployment:
1950 + depends_on: OpenDaylightHostsDeployment
1951 + type: OS::Heat::StructuredDeployment
1953 + server: {get_resource: OpenDaylightNode}
1954 + config: {get_resource: OpenDaylightPuppetConfig}
1956 + update_identifier: {get_param: UpdateIdentifier}
1960 + description: IP address of the server in the ctlplane network
1961 + value: {get_attr: [OpenDaylightNode, networks, ctlplane, 0]}
1962 + opendaylight_controller_ip:
1963 + description: IP address of the server on the internal network
1964 + value: {get_attr: [InternalApiPort, ip_address]}
1965 + config_identifier:
1966 + description: identifier which changes if the node configuration may need re-applying
1970 + - - {get_attr: [OpenDaylightDeployment, deploy_stdout]}
1971 + - {get_param: UpdateIdentifier}