4 files changed, 139 insertions, 1 deletions
diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml
index 85b9aacc..201a2b7b 100644
--- a/puppet/services/ceilometer-api.yaml
+++ b/puppet/services/ceilometer-api.yaml
@@ -47,6 +47,9 @@ outputs:
             # internal_api -> IP
             # internal_api_uri -> [IP]
             # internal_api_subnet - > IP/CIDR
+          - ceilometer::api::service_name: 'httpd'
             ceilometer::api::host: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
+            ceilometer::wsgi::apache::bind_host: {get_param: [ServiceNetMap, CeilometerApiNetwork]}
+            ceilometer::wsgi::apache::ssl: false
       step_config: |
         include ::tripleo::profile::base::ceilometer::api
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml
index dc962297..13ec03ea 100644
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@@ -40,7 +40,13 @@ parameters:
     default: ''
     description: Libvirt VIF driver configuration for the network
     type: string
-
+  NovaVcpuPinSet:
+    description: >
+      A list or range of physical CPU cores to reserve for virtual machine
+      processes.
+      Ex. NovaVcpuPinSet: ['4-12','^8'] will reserve cores from 4-12 excluding 8
+    type: comma_delimited_list
+    default: []
 resources:
   NovaBase:
     type: ./nova-base.yaml
@@ -58,6 +64,7 @@ outputs:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]
           - nova::compute::libvirt::manage_libvirt_services: false
+            nova::compute::vcpu_pin_set: {get_param: NovaVcpuPinSet}
             # we manage migration in nova common puppet profile
             nova::compute::libvirt::migration_support: false
             tripleo::profile::base::nova::manage_migration: true
diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml
new file mode 100644
index 00000000..8bcb72f7
--- /dev/null
+++ b/puppet/services/opendaylight-ovs.yaml
@@ -0,0 +1,47 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenDaylight OVS Configuration.
+
+parameters:
+  OpenDaylightPort:
+    default: 8081
+    description: Set opendaylight service port
+    type: number
+  OpenDaylightConnectionProtocol:
+    description: L7 protocol used for REST access
+    type: string
+    default: 'http'
+  OpenDaylightCheckURL:
+    description: URL postfix to verify ODL has finished starting up
+    type: string
+    default: 'restconf/operational/network-topology:network-topology/topology/netvirt:1'
+  OpenDaylightApiVirtualIP:
+    type: string
+    default: ''
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+
+outputs:
+  role_data:
+    description: Role data for the OpenDaylight service.
+    value:
+      service_name: opendaylight_ovs
+      config_settings:
+        opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
+        opendaylight_check_url: {get_param: OpenDaylightCheckURL}
+        opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
+      step_config: |
+        include tripleo::profile::base::neutron::plugins::ovs::opendaylight
diff --git a/puppet/services/opendaylight.yaml b/puppet/services/opendaylight.yaml
new file mode 100644
index 00000000..c8da7014
--- /dev/null
+++ b/puppet/services/opendaylight.yaml
@@ -0,0 +1,81 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenDaylight SDN Controller.
+
+parameters:
+  OpenDaylightPort:
+    default: 8081
+    description: Set opendaylight service port
+    type: number
+  EnableOpenDaylightOnController:
+    default: false
+    description: Whether to install OpenDaylight on control nodes.
+    type: boolean
+  OpenDaylightUsername:
+    default: 'admin'
+    description: The username for the opendaylight server.
+    type: string
+  OpenDaylightPassword:
+    default: 'admin'
+    type: string
+    description: The password for the opendaylight server.
+    hidden: true
+  OpenDaylightEnableL3:
+    description: Knob to enable/disable ODL L3
+    type: string
+    default: 'no'
+  OpenDaylightEnableDHCP:
+    description: Knob to enable/disable ODL DHCP Server
+    type: boolean
+    default: false
+  OpenDaylightFeatures:
+    description: List of features to install with ODL
+    type: comma_delimited_list
+    default: ["odl-netvirt-openstack","odl-netvirt-ui"]
+  OpenDaylightConnectionProtocol:
+    description: L7 protocol used for REST access
+    type: string
+    default: 'http'
+  OpenDaylightCheckURL:
+    description: URL postfix to verify ODL has finished starting up
+    type: string
+    default: 'restconf/operational/network-topology:network-topology/topology/netvirt:1'
+  OpenDaylightApiVirtualIP:
+    type: string
+    default: ''
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+
+outputs:
+  role_data:
+    description: Role data for the OpenDaylight service.
+    value:
+      service_name: opendaylight
+      config_settings:
+        opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
+        odl_on_controller: {get_param: EnableOpenDaylightOnController}
+        opendaylight_check_url: {get_param: OpenDaylightCheckURL}
+        opendaylight::username: {get_param: OpenDaylightUsername}
+        opendaylight::password: {get_param: OpenDaylightPassword}
+        opendaylight::enable_l3: {get_param: OpenDaylightEnableL3}
+        opendaylight::extra_features: {get_param: OpenDaylightFeatures}
+        opendaylight::enable_dhcp: {get_param: OpenDaylightEnableDHCP}
+        opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
+        opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpenDaylightApiNetwork]}
+        tripleo::haproxy::opendaylight: true
+      step_config: |
+        include tripleo::profile::base::neutron::opendaylight
+        include tripleo::profile::base::neutron::plugins::ovs::opendaylight