PSARC/2016/001 OpenStack Puppet Modules
authorDrew Fisher <drew.fisher@oracle.com>
Tue, 16 Feb 2016 13:47:43 -0800
changeset 5464 6e2e17e6aa45
parent 5463 245bdc05448a
child 5465 c49b82fa1ffd
PSARC/2016/001 OpenStack Puppet Modules 22491714 Request to integrate OpenStack Puppet modules
components/ruby/puppet-modules/openstack-cinder/Makefile
components/ruby/puppet-modules/openstack-cinder/files/backend/zfs_fc.pp
components/ruby/puppet-modules/openstack-cinder/files/backend/zfs_iscsi.pp
components/ruby/puppet-modules/openstack-cinder/files/backend/zfs_volume.pp
components/ruby/puppet-modules/openstack-cinder/files/volume/zfs_fc.pp
components/ruby/puppet-modules/openstack-cinder/files/volume/zfs_iscsi.pp
components/ruby/puppet-modules/openstack-cinder/files/volume/zfs_volume.pp
components/ruby/puppet-modules/openstack-cinder/openstack-cinder.license
components/ruby/puppet-modules/openstack-cinder/openstack-cinder.p5m
components/ruby/puppet-modules/openstack-cinder/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-cinder/patches/02-params.patch
components/ruby/puppet-modules/openstack-cinder/patches/03-grep.patch
components/ruby/puppet-modules/openstack-glance/Makefile
components/ruby/puppet-modules/openstack-glance/openstack-glance.license
components/ruby/puppet-modules/openstack-glance/openstack-glance.p5m
components/ruby/puppet-modules/openstack-glance/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-glance/patches/02-params.patch
components/ruby/puppet-modules/openstack-glance/patches/03-init.patch
components/ruby/puppet-modules/openstack-glance/patches/04-registry.patch
components/ruby/puppet-modules/openstack-glance/patches/05-api.patch
components/ruby/puppet-modules/openstack-heat/Makefile
components/ruby/puppet-modules/openstack-heat/openstack-heat.license
components/ruby/puppet-modules/openstack-heat/openstack-heat.p5m
components/ruby/puppet-modules/openstack-heat/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-heat/patches/02-params.patch
components/ruby/puppet-modules/openstack-heat/patches/03-init.patch
components/ruby/puppet-modules/openstack-heat/patches/04-api.patch
components/ruby/puppet-modules/openstack-heat/patches/05-engine.patch
components/ruby/puppet-modules/openstack-horizon/Makefile
components/ruby/puppet-modules/openstack-horizon/openstack-horizon.license
components/ruby/puppet-modules/openstack-horizon/openstack-horizon.p5m
components/ruby/puppet-modules/openstack-horizon/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-horizon/patches/02-params.patch
components/ruby/puppet-modules/openstack-horizon/patches/03-init.patch
components/ruby/puppet-modules/openstack-horizon/patches/04-template.patch
components/ruby/puppet-modules/openstack-horizon/patches/05-apache.patch
components/ruby/puppet-modules/openstack-ironic/Makefile
components/ruby/puppet-modules/openstack-ironic/files/solaris_ipmitool.pp
components/ruby/puppet-modules/openstack-ironic/openstack-ironic.license
components/ruby/puppet-modules/openstack-ironic/openstack-ironic.p5m
components/ruby/puppet-modules/openstack-ironic/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-ironic/patches/02-params.patch
components/ruby/puppet-modules/openstack-keystone/Makefile
components/ruby/puppet-modules/openstack-keystone/openstack-keystone.license
components/ruby/puppet-modules/openstack-keystone/openstack-keystone.p5m
components/ruby/puppet-modules/openstack-keystone/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-keystone/patches/02-params.patch
components/ruby/puppet-modules/openstack-keystone/patches/03-init.patch
components/ruby/puppet-modules/openstack-keystone/patches/04-client.patch
components/ruby/puppet-modules/openstack-neutron/Makefile
components/ruby/puppet-modules/openstack-neutron/files/evs.pp
components/ruby/puppet-modules/openstack-neutron/openstack-neutron.license
components/ruby/puppet-modules/openstack-neutron/openstack-neutron.p5m
components/ruby/puppet-modules/openstack-neutron/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-neutron/patches/02-params.patch
components/ruby/puppet-modules/openstack-neutron/patches/03-init.patch
components/ruby/puppet-modules/openstack-nova/Makefile
components/ruby/puppet-modules/openstack-nova/files/solaris_zones.pp
components/ruby/puppet-modules/openstack-nova/openstack-nova.license
components/ruby/puppet-modules/openstack-nova/openstack-nova.p5m
components/ruby/puppet-modules/openstack-nova/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-nova/patches/02-params.patch
components/ruby/puppet-modules/openstack-nova/patches/03-init.patch
components/ruby/puppet-modules/openstack-nova/patches/04-generic-service.patch
components/ruby/puppet-modules/openstack-nova/patches/05-api.patch
components/ruby/puppet-modules/openstack-nova/patches/06-compute.patch
components/ruby/puppet-modules/openstack-openstacklib/Makefile
components/ruby/puppet-modules/openstack-openstacklib/openstack-openstacklib.license
components/ruby/puppet-modules/openstack-openstacklib/openstack-openstacklib.p5m
components/ruby/puppet-modules/openstack-openstacklib/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-openstacklib/patches/02-openstackclient.patch
components/ruby/puppet-modules/openstack-swift/Makefile
components/ruby/puppet-modules/openstack-swift/openstack-swift.license
components/ruby/puppet-modules/openstack-swift/openstack-swift.p5m
components/ruby/puppet-modules/openstack-swift/patches/01-metadata.patch
components/ruby/puppet-modules/openstack-swift/patches/02-params.patch
components/ruby/puppet-modules/openstack-swift/patches/03-init.patch
components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch
components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch
components/ruby/puppet-modules/openstack-swift/patches/06-storage.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/Makefile	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		openstack-cinder
+COMPONENT_VERSION=	6.1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:75bede8811adc36d5bab0c5d41a0df3cf4d07da01b98d34715e3262baa6ab637
+COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/cinder
+
+TPNO=			25356
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/puppetmodule.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+MODULE_NAME =	cinder
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/files/backend/zfs_fc.pp	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,26 @@
+# == Class: cinder::backend::zfs_fc
+#
+# Configures Cinder volume ZFSFCDriver
+#
+# === Parameters
+#
+# [*volume_driver*]
+#   (optional) Setup cinder-volume to use Solaris FC volume driver.
+#   Defaults to 'cinder.volume.drivers.solaris.zfs.ZFSFCDriver'
+#
+# [*zfs_volume_base*]
+#   (optional) The ZFS path under which to create zvols for volumes.
+#   Defaults to 'rpool/cinder'
+#
+define cinder::backend::zfs_fc(
+  $volume_driver       = 'cinder.volume.drivers.solaris.zfs.ZFSFCDriver',
+  $zfs_volume_base     = 'rpool/cinder'
+) {
+  
+  cinder_config {
+    "${name}/volume_driver": value => $volume_driver;
+    "${name}/zfs_volume_base": value => $zfs_volume_base;
+    "${name}/san_is_local": value => true;
+    "${name}/san_ip": value => $::ipaddress;
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/files/backend/zfs_iscsi.pp	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,26 @@
+# == Class: cinder::backend::zfs_iscsi
+#
+# Configures Cinder volume ZFSISCSIDriver
+#
+# === Parameters
+#
+# [*volume_driver*]
+#   (optional) Setup cinder-volume to use Solaris ISCSI volume driver.
+#   Defaults to 'cinder.volume.drivers.solaris.zfs.ZFSISCSIDriver'
+#
+# [*zfs_volume_base*]
+#   (optional) The ZFS path under which to create zvols for volumes.
+#   Defaults to 'rpool/cinder'
+#
+define cinder::backend::zfs_iscsi(
+  $volume_driver       = 'cinder.volume.drivers.solaris.zfs.ZFSISCSIDriver',
+  $zfs_volume_base     = 'rpool/cinder'
+) {
+  
+  cinder_config {
+    "${name}/volume_driver": value => $volume_driver;
+    "${name}/zfs_volume_base": value => $zfs_volume_base;
+    "${name}/san_is_local": value => true;
+    "${name}/san_ip": value => $::ipaddress;
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/files/backend/zfs_volume.pp	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,25 @@
+# == Class: cinder::backend::zfs_volume
+#
+# Configures Cinder volume ZFSVolumeDriver
+#
+# === Parameters
+#
+# [*volume_driver*]
+#   (optional) Setup cinder-volume to use Solaris ZFS volume driver.
+#   Defaults to 'cinder.volume.drivers.solaris.zfs.ZFSVolumeDriver'
+#
+# [*zfs_volume_base*]
+#   (optional) The ZFS path under which to create zvols for volumes.
+#   Defaults to 'rpool/cinder'
+#
+define cinder::backend::zfs_volume(
+  $volume_driver       = 'cinder.volume.drivers.solaris.zfs.ZFSVolumeDriver',
+  $zfs_volume_base     = 'rpool/cinder'
+) {
+  
+  cinder_config {
+    "${name}/volume_driver": value => $volume_driver;
+    "${name}/zfs_volume_base": value => $zfs_volume_base;
+    "${name}/san_is_local": value => true;
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/files/volume/zfs_fc.pp	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,18 @@
+# == Class: cinder::volume::zfs_fc
+#
+# Sets up Cinder with the ZFS Fibre Channel driver
+#
+# === Parameters
+#
+# [*zfs_volume_base*]
+#   (optional) The ZFS path under which to create zvols for volumes.
+#   Defaults to 'rpool/cinder'
+#
+class cinder::volume::zfs_fc (
+  $zfs_volume_base = 'rpool/cinder',
+) {
+
+  cinder::backend::zfs_fc { 'DEFAULT':
+    zfs_volume_base => $zfs_volume_base,
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/files/volume/zfs_iscsi.pp	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,18 @@
+# == Class: cinder::volume::zfs_iscsi
+#
+# Sets up Cinder with the ZFS iSCSI driver
+#
+# === Parameters
+#
+# [*zfs_volume_base*]
+#   (optional) The ZFS path under which to create zvols for volumes.
+#   Defaults to 'rpool/cinder'
+#
+class cinder::volume::zfs_iscsi (
+  $zfs_volume_base = 'rpool/cinder',
+) {
+
+  cinder::backend::zfs_iscsi { 'DEFAULT':
+    zfs_volume_base => $zfs_volume_base,
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/files/volume/zfs_volume.pp	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,18 @@
+# == Class: cinder::volume::zfs_volume
+#
+# Sets up Cinder with the ZFS Volume Driver
+#
+# === Parameters
+#
+# [*zfs_volume_base*]
+#   (optional) The ZFS path under which to create zvols for volumes.
+#   Defaults to 'rpool/cinder'
+#
+class cinder::volume::zfs_volume (
+  $zfs_volume_base = 'rpool/cinder',
+) {
+
+  cinder::backend::zfs_volume { 'DEFAULT':
+    zfs_volume_base => $zfs_volume_base,
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/openstack-cinder.license	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,201 @@
+The following applies to all products licensed under the Apache 2.0 License:
+
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+ 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and limitations under the License.
+
+Copyright 2012 OpenStack Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============================================================
+
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/openstack-cinder.p5m	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,204 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/management/puppet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="OpenStack Cinder Puppet Module"
+set name=pkg.description \
+    value="The cinder module is a thorough attempt to make Puppet capable of managing the entirety of cinder.  This includes manifests to provision such things as keystone endpoints, RPC configurations specific to cinder, and database connections.  Types are shipped as part of the cinder module to assist in manipulation of configuration files."
+set name=com.oracle.info.description value="Cinder Puppet Module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.upstream value="OpenStack <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=etc/puppet/modules/cinder/CHANGELOG.md
+file path=etc/puppet/modules/cinder/Gemfile
+file path=etc/puppet/modules/cinder/LICENSE
+file path=etc/puppet/modules/cinder/README.md
+file path=etc/puppet/modules/cinder/Rakefile
+file path=etc/puppet/modules/cinder/checksums.json
+file path=etc/puppet/modules/cinder/examples/cinder_volume_with_pacemaker.pp
+file path=etc/puppet/modules/cinder/lib/puppet/provider/cinder_api_paste_ini/ini_setting.rb
+file path=etc/puppet/modules/cinder/lib/puppet/provider/cinder_config/ini_setting.rb
+file path=etc/puppet/modules/cinder/lib/puppet/type/cinder_api_paste_ini.rb
+file path=etc/puppet/modules/cinder/lib/puppet/type/cinder_config.rb
+file path=etc/puppet/modules/cinder/manifests/api.pp
+file path=etc/puppet/modules/cinder/manifests/backend/dellsc_iscsi.pp
+file path=etc/puppet/modules/cinder/manifests/backend/emc_vnx.pp
+file path=etc/puppet/modules/cinder/manifests/backend/eqlx.pp
+file path=etc/puppet/modules/cinder/manifests/backend/glusterfs.pp
+file path=etc/puppet/modules/cinder/manifests/backend/hp3par_iscsi.pp
+file path=etc/puppet/modules/cinder/manifests/backend/iscsi.pp
+file path=etc/puppet/modules/cinder/manifests/backend/netapp.pp
+file path=etc/puppet/modules/cinder/manifests/backend/nexenta.pp
+file path=etc/puppet/modules/cinder/manifests/backend/nfs.pp
+file path=etc/puppet/modules/cinder/manifests/backend/quobyte.pp
+file path=etc/puppet/modules/cinder/manifests/backend/rbd.pp
+file path=etc/puppet/modules/cinder/manifests/backend/san.pp
+file path=etc/puppet/modules/cinder/manifests/backend/solidfire.pp
+file path=etc/puppet/modules/cinder/manifests/backend/vmdk.pp
+file files/backend/zfs_fc.pp \
+    path=etc/puppet/modules/cinder/manifests/backend/zfs_fc.pp
+file files/backend/zfs_iscsi.pp \
+    path=etc/puppet/modules/cinder/manifests/backend/zfs_iscsi.pp
+file files/backend/zfs_volume.pp \
+    path=etc/puppet/modules/cinder/manifests/backend/zfs_volume.pp
+file path=etc/puppet/modules/cinder/manifests/backends.pp
+file path=etc/puppet/modules/cinder/manifests/backup.pp
+file path=etc/puppet/modules/cinder/manifests/backup/ceph.pp
+file path=etc/puppet/modules/cinder/manifests/backup/nfs.pp
+file path=etc/puppet/modules/cinder/manifests/backup/swift.pp
+file path=etc/puppet/modules/cinder/manifests/ceilometer.pp
+file path=etc/puppet/modules/cinder/manifests/client.pp
+file path=etc/puppet/modules/cinder/manifests/config.pp
+file path=etc/puppet/modules/cinder/manifests/cron/db_purge.pp
+file path=etc/puppet/modules/cinder/manifests/db/mysql.pp
+file path=etc/puppet/modules/cinder/manifests/db/postgresql.pp
+file path=etc/puppet/modules/cinder/manifests/db/sync.pp
+file path=etc/puppet/modules/cinder/manifests/glance.pp
+file path=etc/puppet/modules/cinder/manifests/init.pp
+file path=etc/puppet/modules/cinder/manifests/keystone/auth.pp
+file path=etc/puppet/modules/cinder/manifests/logging.pp
+file path=etc/puppet/modules/cinder/manifests/params.pp
+file path=etc/puppet/modules/cinder/manifests/policy.pp
+file path=etc/puppet/modules/cinder/manifests/qpid.pp
+file path=etc/puppet/modules/cinder/manifests/quota.pp
+file path=etc/puppet/modules/cinder/manifests/rabbitmq.pp
+file path=etc/puppet/modules/cinder/manifests/scheduler.pp
+file path=etc/puppet/modules/cinder/manifests/scheduler/filter.pp
+file path=etc/puppet/modules/cinder/manifests/setup_test_volume.pp
+file path=etc/puppet/modules/cinder/manifests/type.pp
+file path=etc/puppet/modules/cinder/manifests/type_set.pp
+file path=etc/puppet/modules/cinder/manifests/vmware.pp
+file path=etc/puppet/modules/cinder/manifests/volume.pp
+file path=etc/puppet/modules/cinder/manifests/volume/dellsc_iscsi.pp
+file path=etc/puppet/modules/cinder/manifests/volume/emc_vnx.pp
+file path=etc/puppet/modules/cinder/manifests/volume/eqlx.pp
+file path=etc/puppet/modules/cinder/manifests/volume/glusterfs.pp
+file path=etc/puppet/modules/cinder/manifests/volume/hp3par_iscsi.pp
+file path=etc/puppet/modules/cinder/manifests/volume/iscsi.pp
+file path=etc/puppet/modules/cinder/manifests/volume/netapp.pp
+file path=etc/puppet/modules/cinder/manifests/volume/nexenta.pp
+file path=etc/puppet/modules/cinder/manifests/volume/nfs.pp
+file path=etc/puppet/modules/cinder/manifests/volume/quobyte.pp
+file path=etc/puppet/modules/cinder/manifests/volume/rbd.pp
+file path=etc/puppet/modules/cinder/manifests/volume/san.pp
+file path=etc/puppet/modules/cinder/manifests/volume/solidfire.pp
+file path=etc/puppet/modules/cinder/manifests/volume/vmdk.pp
+file files/volume/zfs_fc.pp \
+    path=etc/puppet/modules/cinder/manifests/volume/zfs_fc.pp
+file files/volume/zfs_iscsi.pp \
+    path=etc/puppet/modules/cinder/manifests/volume/zfs_iscsi.pp
+file files/volume/zfs_volume.pp \
+    path=etc/puppet/modules/cinder/manifests/volume/zfs_volume.pp
+file path=etc/puppet/modules/cinder/metadata.json
+file path=etc/puppet/modules/cinder/spec/acceptance/basic_cinder_spec.rb
+file path=etc/puppet/modules/cinder/spec/acceptance/nodesets/default.yml
+file path=etc/puppet/modules/cinder/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=etc/puppet/modules/cinder/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/cinder/spec/classes/cinder_api_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_backends_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_backup_ceph_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_backup_nfs_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_backup_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_backup_swift_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_ceilometer_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_client_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_cron_db_purge_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_db_mysql_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_db_postgresql_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_db_sync_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_glance_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_keystone_auth_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_logging_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_params_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_policy_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_qpid_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_quota_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_rabbitmq_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_scheduler_filter_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_scheduler_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_setup_test_volume_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_vmware_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_dellsc_iscsi_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_emc_vnx_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_eqlx_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_glusterfs_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_hp3par_iscsi_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_iscsi_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_netapp_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_nexenta_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_nfs_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_quobyte_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_rbd_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_san_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_solidfire_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_spec.rb
+file path=etc/puppet/modules/cinder/spec/classes/cinder_volume_vmdk_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_dellsc_iscsi_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_emc_vnx_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_eqlx_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_glusterfs_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_hp3par_iscsi_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_iscsi_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_netapp_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_nexenta_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_nfs_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_quobyte_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_rbd_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_san_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_solidfire_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_backend_vmdk_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_type_set_spec.rb
+file path=etc/puppet/modules/cinder/spec/defines/cinder_type_spec.rb
+file path=etc/puppet/modules/cinder/spec/shared_examples.rb
+file path=etc/puppet/modules/cinder/spec/spec_helper.rb
+file path=etc/puppet/modules/cinder/spec/spec_helper_acceptance.rb
+#
+license openstack-cinder.license license="Apache v2.0"
+
+# force a dependency on openstack-keystone
+depend type=require fmri=system/management/puppet/openstack-keystone
+
+# force a dependency on openstack-openstacklib
+depend type=require fmri=system/management/puppet/openstack-openstacklib
+
+# force a dependency on puppetlabs-inifile
+depend type=require fmri=system/management/puppet/puppetlabs-inifile
+
+# force a dependency on puppetlabs-rabbitmq
+depend type=require fmri=system/management/puppet/puppetlabs-rabbitmq
+
+# force a dependency on puppetlabs-stdlib
+depend type=require fmri=system/management/puppet/puppetlabs-stdlib
+
+# force a dependency on gnu-grep
+depend type=require fmri=text/gnu-grep
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/patches/01-metadata.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,28 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-cinder-6.1.0/metadata.json.orig   2015-10-15 08:52:10.210316994 -0700
++++ openstack-cinder-6.1.0/metadata.json       2015-10-15 08:53:13.334830608 -0700
[email protected]@ -8,7 +8,6 @@
+   "project_page": "https://launchpad.net/puppet-cinder",
+   "issues_url": "https://bugs.launchpad.net/puppet-cinder",
+   "dependencies": [
+-    {"name":"dprince/qpid","version_requirement":">=1.0.0 <2.0.0"},
+     {"name":"puppetlabs/inifile","version_requirement":">=1.0.0 <2.0.0"},
+     {"name":"openstack/keystone","version_requirement":">=6.0.0 <7.0.0"},
+     {"name":"puppetlabs/rabbitmq","version_requirement":">=2.0.2 <6.0.0"},
[email protected]@ -51,6 +50,13 @@
+         "12.04",
+         "14.04"
+       ]
++    },
++    {
++      "operatingsystem": "Solaris",
++      "operatingsystemrelease": [
++        "11.3",
++        "12.0"
++      ]
+     }
+   ],
+   "description": "Installs and configures OpenStack Cinder (Block Storage)."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/patches/02-params.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,32 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-cinder-6.1.0/manifests/params.pp.orig	2015-10-15 09:42:47.576607396 -0600
++++ openstack-cinder-6.1.0/manifests/params.pp	2015-10-15 09:43:48.776845153 -0600
[email protected]@ -51,7 +51,24 @@ class cinder::params {
+       }
+     }
+
++  } elsif($::osfamily == 'Solaris') {
++    $package_name       = 'cloud/openstack/cinder'
++    $client_package     = 'library/python/cinderclient'
++    $api_package        = undef
++    $api_service        = 'application/openstack/cinder/cinder-api:default'
++    $backup_package     = undef
++    $backup_service     = 'application/openstack/cinder/cinder-backup:default'
++    $scheduler_package  = undef
++    $scheduler_service  = 'application/openstack/cinder/cinder-scheduler:default'
++    $volume_package     = undef
++    $volume_service     = 'application/openstack/cinder/cinder-volume:default'
++    $db_sync_command    = 'cinder-manage db sync'
++    $tgt_package_name   = undef
++    $tgt_service_name   = undef
++    $ceph_init_override = undef
++    $iscsi_helper       = undef
++    $lio_package_name   = undef
+   } else {
+-    fail("unsupported osfamily ${::osfamily}, currently Debian and Redhat are the only supported platforms")
++    fail("unsupported osfamily ${::osfamily}, currently Solaris, Debian, and Redhat are the only supported platforms")
+   }
+ }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-cinder/patches/03-grep.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,50 @@
+Patch to change /bin/grep to /bin/ggrep as the module uses flags
+/bin/grep doesn't understand.
+
+The patch is not suitable for upstream and can be removed when
+/bin/grep enters this century.  See bug 22742880 for more information.
+
+--- openstack-cinder-6.1.0/spec/defines/cinder_type_set_spec.rb.orig	Fri Jan 15 11:57:08 2016
++++ openstack-cinder-6.1.0/spec/defines/cinder_type_set_spec.rb	Fri Jan 15 11:57:13 2016
[email protected]@ -19,7 +19,7 @@
+   it 'should have its execs' do
+     is_expected.to contain_exec('cinder type-key sith set monchichi=hippo').with(
+       :command => 'cinder type-key sith set monchichi=hippo',
+-      :unless  => "cinder extra-specs-list | grep -Eq '\\bsith\\b.*\\bmonchichi\\b.*\\bhippo\\b'",
++      :unless  => "cinder extra-specs-list | ggrep -Eq '\\bsith\\b.*\\bmonchichi\\b.*\\bhippo\\b'",
+       :environment => [
+         'OS_TENANT_NAME=admin',
+         'OS_USERNAME=admin',
+--- openstack-cinder-6.1.0/spec/defines/cinder_type_spec.rb.orig	Fri Jan 15 11:57:13 2016
++++ openstack-cinder-6.1.0/spec/defines/cinder_type_spec.rb	Fri Jan 15 11:57:19 2016
[email protected]@ -24,7 +24,7 @@
+         'OS_USERNAME=admin',
+         'OS_PASSWORD=asdf',
+         'OS_AUTH_URL=http://127.127.127.1:5000/v2.0/'],
+-      :unless  => "cinder type-list | grep -qP '\\bhippo\\b'",
++      :unless  => "cinder type-list | ggrep -qP '\\bhippo\\b'",
+       :require => 'Package[python-cinderclient]')
+     is_expected.to contain_exec('cinder type-key hippo set volume_backend_name=name1')
+     is_expected.to contain_exec('cinder type-key hippo set volume_backend_name=name2')
+--- openstack-cinder-6.1.0/manifests/type_set.pp.orig	Fri Jan 15 11:57:19 2016
++++ openstack-cinder-6.1.0/manifests/type_set.pp	Fri Jan 15 11:57:21 2016
[email protected]@ -58,7 +58,7 @@
+   exec {"cinder type-key ${type} set ${key}=${name}":
+     path        => ['/usr/bin', '/bin'],
+     command     => "cinder type-key ${type} set ${key}=${name}",
+-    unless      => "cinder extra-specs-list | grep -Eq '\\b${type}\\b.*\\b${key}\\b.*\\b${name}\\b'",
++    unless      => "cinder extra-specs-list | ggrep -Eq '\\b${type}\\b.*\\b${key}\\b.*\\b${name}\\b'",
+     environment => concat($cinder_env, $region_env),
+     require     => Package['python-cinderclient']
+   }
+--- openstack-cinder-6.1.0/manifests/type.pp.orig	Fri Jan 15 11:57:21 2016
++++ openstack-cinder-6.1.0/manifests/type.pp	Fri Jan 15 11:57:27 2016
[email protected]@ -66,7 +66,7 @@
+ 
+   exec {"cinder type-create ${volume_name}":
+     command     => "cinder type-create ${volume_name}",
+-    unless      => "cinder type-list | grep -qP '\\b${volume_name}\\b'",
++    unless      => "cinder type-list | ggrep -qP '\\b${volume_name}\\b'",
+     environment => concat($cinder_env, $region_env),
+     require     => Package['python-cinderclient'],
+     path        => ['/usr/bin', '/bin'],
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-glance/Makefile	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		openstack-glance
+COMPONENT_VERSION=	6.1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+    sha256:1e6ff3512ccda30362fcb4c40d181ac6bb6c4532475d578b54b95319093ec981
+COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/glance
+
+TPNO=			25366
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/puppetmodule.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+MODULE_NAME =	glance
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-glance/openstack-glance.license	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,205 @@
+The following applies to all products licensed under the Apache 2.0 License:
+
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+ 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and limitations under the License.
+
+LICENSE:
+
+Copyright (C) 2012 Puppet Labs Inc
+
+Puppet Labs can be contacted at: [email protected]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+============================================================
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-glance/openstack-glance.p5m	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,125 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/management/puppet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="OpenStack Glance Puppet Module"
+set name=pkg.description \
+    value="The glance module is a thorough attempt to make Puppet capable of managing the entirety of glance.  This includes manifests to provision such things as keystone endpoints, RPC configurations specific to glance, and database connections.  Types are shipped as part of the glance module to assist in manipulation of configuration files."
+set name=com.oracle.info.description value="Glance Puppet Module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.upstream value="OpenStack <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=etc/puppet/modules/glance/CHANGELOG.md
+file path=etc/puppet/modules/glance/Gemfile
+file path=etc/puppet/modules/glance/LICENSE
+file path=etc/puppet/modules/glance/README.md
+file path=etc/puppet/modules/glance/Rakefile
+file path=etc/puppet/modules/glance/checksums.json
+file path=etc/puppet/modules/glance/ext/glance.rb
+file path=etc/puppet/modules/glance/ext/glance.sh
+file path=etc/puppet/modules/glance/lib/puppet/provider/glance.rb
+file path=etc/puppet/modules/glance/lib/puppet/provider/glance_api_config/ini_setting.rb
+file path=etc/puppet/modules/glance/lib/puppet/provider/glance_api_paste_ini/ini_setting.rb
+file path=etc/puppet/modules/glance/lib/puppet/provider/glance_cache_config/ini_setting.rb
+file path=etc/puppet/modules/glance/lib/puppet/provider/glance_image/glance.rb
+file path=etc/puppet/modules/glance/lib/puppet/provider/glance_registry_config/ini_setting.rb
+file path=etc/puppet/modules/glance/lib/puppet/provider/glance_registry_paste_ini/ini_setting.rb
+file path=etc/puppet/modules/glance/lib/puppet/type/glance_api_config.rb
+file path=etc/puppet/modules/glance/lib/puppet/type/glance_api_paste_ini.rb
+file path=etc/puppet/modules/glance/lib/puppet/type/glance_cache_config.rb
+file path=etc/puppet/modules/glance/lib/puppet/type/glance_image.rb
+file path=etc/puppet/modules/glance/lib/puppet/type/glance_registry_config.rb
+file path=etc/puppet/modules/glance/lib/puppet/type/glance_registry_paste_ini.rb
+file path=etc/puppet/modules/glance/manifests/api.pp
+file path=etc/puppet/modules/glance/manifests/backend/cinder.pp
+file path=etc/puppet/modules/glance/manifests/backend/file.pp
+file path=etc/puppet/modules/glance/manifests/backend/rbd.pp
+file path=etc/puppet/modules/glance/manifests/backend/swift.pp
+file path=etc/puppet/modules/glance/manifests/backend/vsphere.pp
+file path=etc/puppet/modules/glance/manifests/cache/cleaner.pp
+file path=etc/puppet/modules/glance/manifests/cache/pruner.pp
+file path=etc/puppet/modules/glance/manifests/client.pp
+file path=etc/puppet/modules/glance/manifests/config.pp
+file path=etc/puppet/modules/glance/manifests/db/mysql.pp
+file path=etc/puppet/modules/glance/manifests/db/postgresql.pp
+file path=etc/puppet/modules/glance/manifests/init.pp
+file path=etc/puppet/modules/glance/manifests/keystone/auth.pp
+file path=etc/puppet/modules/glance/manifests/notify/qpid.pp
+file path=etc/puppet/modules/glance/manifests/notify/rabbitmq.pp
+file path=etc/puppet/modules/glance/manifests/params.pp
+file path=etc/puppet/modules/glance/manifests/policy.pp
+file path=etc/puppet/modules/glance/manifests/registry.pp
+file path=etc/puppet/modules/glance/metadata.json
+file path=etc/puppet/modules/glance/spec/acceptance/basic_glance_spec.rb
+file path=etc/puppet/modules/glance/spec/acceptance/nodesets/default.yml
+file path=etc/puppet/modules/glance/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=etc/puppet/modules/glance/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/glance/spec/classes/glance_api_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_backend_cinder_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_backend_file_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_backend_rbd_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_backend_swift_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_backend_vsphere_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_cache_cleaner_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_cache_pruner_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_client_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_db_mysql_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_db_postgresql_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_keystone_auth_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_notify_qpid_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_notify_rabbitmq_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_policy_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_registry_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_spec.rb
+file path=etc/puppet/modules/glance/spec/shared_examples.rb
+file path=etc/puppet/modules/glance/spec/spec.opts
+file path=etc/puppet/modules/glance/spec/spec_helper.rb
+file path=etc/puppet/modules/glance/spec/spec_helper_acceptance.rb
+file path=etc/puppet/modules/glance/spec/unit/provider/glance_spec.rb
+file path=etc/puppet/modules/glance/tests/api.pp
+file path=etc/puppet/modules/glance/tests/init.pp
+file path=etc/puppet/modules/glance/tests/registry.pp
+file path=etc/puppet/modules/glance/tests/site.pp
+#
+license openstack-glance.license license="Apache v2.0"
+
+# force a dependency on openstack-keystone
+depend type=require fmri=system/management/puppet/openstack-keystone
+
+# force a dependency on openstack-openstacklib
+depend type=require fmri=system/management/puppet/openstack-openstacklib
+
+# force a dependency on puppetlabs-inifile
+depend type=require fmri=system/management/puppet/puppetlabs-inifile
+
+# force a dependency on puppetlabs-stdlib
+depend type=require fmri=system/management/puppet/puppetlabs-stdlib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-glance/patches/01-metadata.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,20 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-glance-6.1.0/metadata.json.orig   2015-10-15 08:59:59.585008574 -0700
++++ openstack-glance-6.1.0/metadata.json       2015-10-15 08:59:37.343357849 -0700
[email protected]@ -49,6 +49,13 @@
+         "12.04",
+         "14.04"
+       ]
++    },
++    {
++      "operatingsystem": "Solaris",
++      "operatingsystemrelease": [
++        "11.3",
++        "12.0"
++      ]
+     }
+   ],
+   "description": "Installs and configures OpenStack Glance (Image Service)."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-glance/patches/02-params.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,55 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-glance-6.1.0/manifests/params.pp.orig     2015-08-10 09:37:49.703015029 -0700
++++ openstack-glance-6.1.0/manifests/params.pp   2015-08-10 09:38:51.370489635 -0700
[email protected]@ -1,14 +1,11 @@
+ # these parameters need to be accessed from several locations and
+ # should be considered to be constant
+ class glance::params {
+-
+-  $client_package_name = 'python-glanceclient'
+-
+-  $cache_cleaner_command = 'glance-cache-cleaner'
+-  $cache_pruner_command  = 'glance-cache-pruner'
+-
+   case $::osfamily {
+     'RedHat': {
++      $client_package_name   = 'python-glanceclient'
++      $cache_cleaner_command = 'glance-cache-cleaner'
++      $cache_pruner_command  = 'glance-cache-pruner'
+       $api_package_name      = 'openstack-glance'
+       $registry_package_name = 'openstack-glance'
+       $api_service_name      = 'openstack-glance-api'
[email protected]@ -21,6 +18,9 @@ class glance::params {
+       }
+     }
+     'Debian': {
++      $client_package_name   = 'python-glanceclient'
++      $cache_cleaner_command = 'glance-cache-cleaner'
++      $cache_pruner_command  = 'glance-cache-pruner'
+       $api_package_name      = 'glance-api'
+       $registry_package_name = 'glance-registry'
+       $api_service_name      = 'glance-api'
[email protected]@ -28,8 +28,19 @@ class glance::params {
+       $db_sync_command       = 'glance-manage --config-file=/etc/glance/glance-registry.conf db_sync'
+       $pyceph_package_name   = 'python-ceph'
+     }
++    'Solaris': {
++      $client_package_name   = 'library/python/glanceclient'
++      $pyceph_package_name   = undef
++      $cache_cleaner_command = '/usr/lib/glance/glance-cache-cleaner'
++      $cache_pruner_command  = '/usr/lib/glance/glance-cache-pruner'
++      $api_package_name      = 'cloud/openstack/glance'
++      $registry_package_name = 'cloud/openstack/glance'
++      $api_service_name      = 'application/openstack/glance/glance-api'
++      $registry_service_name = 'application/openstack/glance/glance-registry'
++      $db_sync_command       = undef
++    }
+     default: {
+-      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
++      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily Solaris, RedHat, and Debian")
+     }
+   }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-glance/patches/03-init.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,20 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-glance-6.1.0/manifests/init.pp.orig     2015-08-10 09:39:41.906630428 -0700
++++ openstack-glance-6.1.0/manifests/init.pp     2015-08-10 09:40:10.746985189 -0700
[email protected]@ -15,13 +15,6 @@ class glance(
+
+   include ::glance::params
+
+-  file { '/etc/glance/':
+-    ensure => directory,
+-    owner  => 'glance',
+-    group  => 'root',
+-    mode   => '0770',
+-  }
+-
+   if ( $glance::params::api_package_name == $glance::params::registry_package_name ) {
+     package { $glance::params::api_package_name :
+       ensure => $package_ensure,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-glance/patches/04-registry.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,24 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-glance-6.1.0/manifests/registry.pp.orig 2015-08-10 09:42:54.166718964 -0700
++++ openstack-glance-6.1.0/manifests/registry.pp 2015-08-10 09:43:04.061499589 -0700
[email protected]@ -171,7 +171,6 @@ class glance::registry(
+     )
+   }
+
+-  Package[$glance::params::registry_package_name] -> File['/etc/glance/']
+   Package[$glance::params::registry_package_name] -> Glance_registry_config<||>
+
+   Glance_registry_config<||> ~> Exec<| title == 'glance-manage db_sync' |>
[email protected]@ -179,9 +178,6 @@ class glance::registry(
+
+   File {
+     ensure  => present,
+-    owner   => 'glance',
+-    group   => 'glance',
+-    mode    => '0640',
+     notify  => Service['glance-registry'],
+     require => Class['glance']
+   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-glance/patches/05-api.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,24 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-glance-6.1.0/manifests/api.pp.orig        2015-08-10 09:41:12.485497819 -0700
++++ openstack-glance-6.1.0/manifests/api.pp      2015-08-10 09:42:24.192123343 -0700
[email protected]@ -248,7 +248,6 @@ class glance::api(
+     )
+   }
+
+-  Package[$glance::params::api_package_name] -> File['/etc/glance/']
+   Package[$glance::params::api_package_name] -> Class['glance::policy']
+   Package[$glance::params::api_package_name] -> Glance_api_config<||>
+   Package[$glance::params::api_package_name] -> Glance_cache_config<||>
[email protected]@ -265,9 +264,6 @@ class glance::api(
+
+   File {
+     ensure  => present,
+-    owner   => 'glance',
+-    group   => 'glance',
+-    mode    => '0640',
+     notify  => Service['glance-api'],
+     require => Class['glance']
+   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-heat/Makefile	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		openstack-heat
+COMPONENT_VERSION=	6.1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+    sha256:2e33447b5b205b9dc020420e0303fec9317bbea74f675ff7af189b6f540710fd
+COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/heat
+
+TPNO=			25368
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/puppetmodule.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+MODULE_NAME =	heat
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-heat/openstack-heat.license	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,201 @@
+The following applies to all products licensed under the Apache 2.0 License:
+
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+ 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and limitations under the License.
+LICENSE:
+
+Copyright 2012 OpenStack Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============================================================
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-heat/openstack-heat.p5m	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,98 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/management/puppet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="OpenStack Heat Puppet Module"
+set name=pkg.description \
+    value="The heat module is an attempt to make Puppet capable of managing the entirety of heat."
+set name=com.oracle.info.description value="Heat Puppet Module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.upstream value="OpenStack <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=etc/puppet/modules/heat/CHANGELOG.md
+file path=etc/puppet/modules/heat/Gemfile
+file path=etc/puppet/modules/heat/LICENSE
+file path=etc/puppet/modules/heat/README.md
+file path=etc/puppet/modules/heat/Rakefile
+file path=etc/puppet/modules/heat/checksums.json
+file path=etc/puppet/modules/heat/examples/site.pp
+file path=etc/puppet/modules/heat/lib/puppet/provider/heat_config/ini_setting.rb
+file path=etc/puppet/modules/heat/lib/puppet/type/heat_config.rb
+file path=etc/puppet/modules/heat/manifests/api.pp
+file path=etc/puppet/modules/heat/manifests/api_cfn.pp
+file path=etc/puppet/modules/heat/manifests/api_cloudwatch.pp
+file path=etc/puppet/modules/heat/manifests/client.pp
+file path=etc/puppet/modules/heat/manifests/db/mysql.pp
+file path=etc/puppet/modules/heat/manifests/db/postgresql.pp
+file path=etc/puppet/modules/heat/manifests/engine.pp
+file path=etc/puppet/modules/heat/manifests/init.pp
+file path=etc/puppet/modules/heat/manifests/keystone/auth.pp
+file path=etc/puppet/modules/heat/manifests/keystone/auth_cfn.pp
+file path=etc/puppet/modules/heat/manifests/keystone/domain.pp
+file path=etc/puppet/modules/heat/manifests/logging.pp
+file path=etc/puppet/modules/heat/manifests/params.pp
+file path=etc/puppet/modules/heat/manifests/policy.pp
+file path=etc/puppet/modules/heat/metadata.json
+file path=etc/puppet/modules/heat/spec/acceptance/basic_heat_spec.rb
+file path=etc/puppet/modules/heat/spec/acceptance/nodesets/default.yml
+file path=etc/puppet/modules/heat/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=etc/puppet/modules/heat/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/heat/spec/classes/heat_api_cfn_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_api_cloudwatch_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_api_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_client_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_db_mysql_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_db_postgresql_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_engine_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_init_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_keystone_auth_cfn_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_keystone_auth_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_keystone_domain_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_logging_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_policy_spec.rb
+file path=etc/puppet/modules/heat/spec/shared_examples.rb
+file path=etc/puppet/modules/heat/spec/spec_helper.rb
+file path=etc/puppet/modules/heat/spec/spec_helper_acceptance.rb
+#
+license openstack-heat.license license="Apache v2.0"
+
+# force a dependency on openstack-keystone
+depend type=require fmri=system/management/puppet/openstack-keystone
+
+# force a dependency on openstack-openstacklib
+depend type=require fmri=system/management/puppet/openstack-openstacklib
+
+# force a dependency on puppetlabs-inifile
+depend type=require fmri=system/management/puppet/puppetlabs-inifile
+
+# force a dependency on puppetlabs-stdlib
+depend type=require fmri=system/management/puppet/puppetlabs-stdlib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-heat/patches/01-metadata.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,20 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-heat-6.1.0/metadata.json.orig   2015-10-15 09:04:16.179847720 -0700
++++ openstack-heat-6.1.0/metadata.json       2015-10-15 09:04:59.346275423 -0700
[email protected]@ -49,6 +49,13 @@
+         "12.04",
+         "14.04"
+       ]
++    },
++    {
++      "operatingsystem": "Solaris",
++      "operatingsystemrelease": [
++        "11.3",
++        "12.0"
++      ]
+     }
+   ],
+   "description": "Installs and configures OpenStack Heat (Orchestration)."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-heat/patches/02-params.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,32 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-heat-6.1.0/manifests/params.pp.orig	2015-05-29 10:14:14.918710769 -0600
++++ openstack-heat-6.1.0/manifests/params.pp	2015-05-29 10:14:53.068950697 -0600
[email protected]@ -45,10 +45,24 @@ class heat::params {
+         }
+       }
+     }
++    'Solaris': {
++      # package names
++      $api_package_name = 'cloud/openstack/heat'
++      $api_cloudwatch_package_name = 'cloud/openstack/heat'
++      $api_cfn_package_name = 'cloud/openstack/heat'
++      $engine_package_name = 'cloud/openstack/heat'
++      $client_package_name = 'library/python/heatclient'
++      $common_package_name = 'cloud/openstack/heat'
++      # service names
++      $api_service_name = 'application/openstack/heat/heat-api'
++      $api_cloudwatch_service_name = 'application/openstack/heat/heat-api-cloudwatch'
++      $api_cfn_service_name = 'application/openstack/heat/heat-api-cfn'
++      $engine_service_name = 'application/openstack/heat/heat-engine'
++    }
+     default: {
+       fail("Unsupported osfamily: ${::osfamily} operatingsystem: \
+ ${::operatingsystem}, module ${module_name} only support osfamily \
+-RedHat and Debian")
++Solaris, RedHat, and Debian")
+     }
+   }
+ }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-heat/patches/03-init.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,37 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has been submitted and is in new versions of this module.
+
+--- openstack-heat-6.1.0/manifests/init.pp.orig	2015-05-29 10:15:21.653268994 -0600
++++ openstack-heat-6.1.0/manifests/init.pp	2015-05-29 10:15:55.528819621 -0600
[email protected]@ -265,30 +265,12 @@ class heat(
+     require => Package['heat-common'],
+   }
+ 
+-  group { 'heat':
+-    name    => 'heat',
+-    require => Package['heat-common'],
+-  }
+-
+-  user { 'heat':
+-    name    => 'heat',
+-    gid     => 'heat',
+-    groups  => ['heat'],
+-    system  => true,
+-    require => Package['heat-common'],
+-  }
+-
+   file { '/etc/heat/':
+     ensure => directory,
+-    owner  => 'heat',
+-    group  => 'heat',
+-    mode   => '0750',
+   }
+ 
+   file { '/etc/heat/heat.conf':
+-    owner => 'heat',
+-    group => 'heat',
+-    mode  => '0640',
++    ensure => present,
+   }
+ 
+   package { 'heat-common':
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-heat/patches/04-api.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,54 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-heat-6.1.0/manifests/api.pp.orig        2015-08-10 09:46:05.129811698 -0700
++++ openstack-heat-6.1.0/manifests/api.pp      2015-08-10 09:47:39.509312624 -0700
[email protected]@ -62,12 +62,22 @@ class heat::api (
+   include ::heat::params
+   include ::heat::policy
+
++  if ( $heat::params::api_package_name != $heat::params::common_package_name ) {
++    ensure_packages([$heat::params::api_package_name],
++      {
++        ensure => $package_ensure,
++        name   => $::heat::params::api_package_name,
++        tag    => ['openstack'],
++      }
++    )
++  }
++
+   Heat_config<||> ~> Service['heat-api']
+   Class['heat::policy'] -> Service['heat-api']
+
+-  Package['heat-api'] -> Heat_config<||>
+-  Package['heat-api'] -> Class['heat::policy']
+-  Package['heat-api'] -> Service['heat-api']
++  Package[$::heat::params::api_package_name] -> Heat_config<||>
++  Package[$::heat::params::api_package_name] -> Class['heat::policy']
++  Package[$::heat::params::api_package_name] -> Service['heat-api']
+
+   if $use_ssl {
+     if !$cert_file {
[email protected]@ -78,12 +88,6 @@ class heat::api (
+     }
+   }
+
+-  package { 'heat-api':
+-    ensure => $package_ensure,
+-    name   => $::heat::params::api_package_name,
+-    tag    => 'openstack',
+-  }
+-
+   if $manage_service {
+     if $enabled {
+       $service_ensure = 'running'
[email protected]@ -99,7 +103,7 @@ class heat::api (
+     hasstatus  => true,
+     hasrestart => true,
+     require    => [Package['heat-common'],
+-                  Package['heat-api']],
++                  Package[$::heat::params::api_package_name]],
+     subscribe  => $::heat::subscribe_sync_db,
+   }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-heat/patches/05-engine.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,45 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-heat-6.1.0/manifests/engine.pp.orig       2015-08-10 09:48:29.999206790 -0700
++++ openstack-heat-6.1.0/manifests/engine.pp   2015-08-10 09:51:44.134426445 -0700
[email protected]@ -109,16 +109,21 @@ class heat::engine (
+   include ::heat
+   include ::heat::params
+
++  if ( $heat::params::engine_package_name != $heat::params::common_package_name ) {
++    ensure_packages([$heat::params::engine_package_name],
++      {
++        ensure => $package_ensure,
++        name   => $::heat::params::engine_package_name,
++        tag    => ['openstack'],
++       notify => $::heat::subscribe_sync_db,
++      }
++    )
++  }
++
+   Heat_config<||> ~> Service['heat-engine']
+
+-  Package['heat-engine'] -> Heat_config<||>
+-  Package['heat-engine'] -> Service['heat-engine']
+-  package { 'heat-engine':
+-    ensure => $package_ensure,
+-    name   => $::heat::params::engine_package_name,
+-    tag    => 'openstack',
+-    notify => $::heat::subscribe_sync_db,
+-  }
++  Package[$::heat::params::engine_package_name] -> Heat_config<||>
++  Package[$::heat::params::engine_package_name] -> Service['heat-engine']
+
+   if $manage_service {
+     if $enabled {
[email protected]@ -143,7 +148,7 @@ class heat::engine (
+     hasrestart => true,
+     require    => [ File['/etc/heat/heat.conf'],
+                     Package['heat-common'],
+-                    Package['heat-engine']],
++                    Package[$::heat::params::engine_package_name]],
+     subscribe  => $::heat::subscribe_sync_db,
+   }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-horizon/Makefile	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		openstack-horizon
+COMPONENT_VERSION=	6.1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+    sha256:45b5105ab194e1fce6ef4e781d922f430c67e7d78cf2260da4189657215c964d
+COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/horizon
+
+TPNO=			25370
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/puppetmodule.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+MODULE_NAME =	horizon
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-horizon/openstack-horizon.license	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,202 @@
+The following applies to all products licensed under the Apache 2.0 License:
+
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+ 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and limitations under the License.
+
+LICENSE:
+
+Copyright 2012 OpenStack Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============================================================
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-horizon/openstack-horizon.p5m	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,77 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/management/puppet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="OpenStack Horizon Puppet Module"
+set name=pkg.description \
+    value="The horizon module is a thorough attempt to make Puppet capable of managing the entirety of horizon.  Horizon is a fairly classic django application, which results in a fairly simply Puppet module."
+set name=com.oracle.info.description value="Horizon Puppet Module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.upstream value="OpenStack <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=etc/puppet/modules/horizon/CHANGELOG.md
+file path=etc/puppet/modules/horizon/Gemfile
+file path=etc/puppet/modules/horizon/LICENSE
+file path=etc/puppet/modules/horizon/README.md
+file path=etc/puppet/modules/horizon/Rakefile
+file path=etc/puppet/modules/horizon/checksums.json
+file path=etc/puppet/modules/horizon/lib/puppet/parser/functions/os_any2array.rb
+file path=etc/puppet/modules/horizon/manifests/init.pp
+file path=etc/puppet/modules/horizon/manifests/params.pp
+file path=etc/puppet/modules/horizon/manifests/wsgi/apache.pp
+file path=etc/puppet/modules/horizon/metadata.json
+file path=etc/puppet/modules/horizon/spec/acceptance/horizon_with_apache_spec.rb
+file path=etc/puppet/modules/horizon/spec/acceptance/nodesets/default.yml
+file path=etc/puppet/modules/horizon/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=etc/puppet/modules/horizon/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/horizon/spec/classes/horizon_init_spec.rb
+file path=etc/puppet/modules/horizon/spec/classes/horizon_wsgi_apache_spec.rb
+file path=etc/puppet/modules/horizon/spec/fixtures/override_local_settings.py.erb
+file path=etc/puppet/modules/horizon/spec/shared_examples.rb
+file path=etc/puppet/modules/horizon/spec/spec_helper.rb
+file path=etc/puppet/modules/horizon/spec/spec_helper_acceptance.rb
+file path=etc/puppet/modules/horizon/spec/unit/puppet/parser/functions/os_any2array_spec.rb
+file path=etc/puppet/modules/horizon/templates/local_settings.py.erb
+#
+license openstack-horizon.license license="Apache v2.0"
+
+# force a dependency on puppetlabs-apache
+depend type=require fmri=system/management/puppet/puppetlabs-apache
+
+# force a dependency on puppetlabs-concat
+depend type=require fmri=system/management/puppet/puppetlabs-concat
+
+# force a dependency on puppet-stdlib
+depend type=require fmri=system/management/puppet/puppetlabs-stdlib
+
+# force a dependency on puppet-memcached
+depend type=require fmri=system/management/puppet/saz-memcached
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/01-metadata.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,20 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-horizon-6.1.0/metadata.json.orig   2015-10-15 09:08:36.076687173 -0700
++++ openstack-horizon-6.1.0/metadata.json       2015-10-15 09:10:00.860099386 -0700
[email protected]@ -48,6 +48,13 @@
+         "12.04",
+         "14.04"
+       ]
++    },
++    {
++      "operatingsystem": "Solaris",
++      "operatingsystemrelease": [
++        "11.3",
++        "12.0"
++      ]
+     }
+   ],
+   "description": "Installs and configures OpenStack Horizon (Dashboard)."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/02-params.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,57 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-horizon-6.1.0/manifests/params.pp.orig	2015-04-23 15:14:49.613879625 -0600
++++ openstack-horizon-6.1.0/manifests/params.pp	2015-04-23 15:18:41.786048628 -0600
[email protected]@ -2,12 +2,11 @@
+ # should be considered to be constant
+ class horizon::params {
+
+-  $logdir      = '/var/log/horizon'
+-  $django_wsgi = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi'
+-  $manage_py   = '/usr/share/openstack-dashboard/manage.py'
+-
+   case $::osfamily {
+     'RedHat': {
++      $logdir                      = '/var/log/horizon'
++      $django_wsgi                 = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi'
++      $manage_py                   = '/usr/share/openstack-dashboard/manage.py'
+       $http_service                = 'httpd'
+       $http_modwsgi                = 'mod_wsgi'
+       $package_name                = 'openstack-dashboard'
[email protected]@ -21,6 +20,9 @@ class horizon::params {
+       $wsgi_group                  = 'dashboard'
+     }
+     'Debian': {
++      $logdir                      = '/var/log/horizon'
++      $django_wsgi                 = '/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi'
++      $manage_py                   = '/usr/share/openstack-dashboard/manage.py'
+       $http_service                = 'apache2'
+       $config_file                 = '/etc/openstack-dashboard/local_settings.py'
+       $httpd_listen_config_file    = '/etc/apache2/ports.conf'
[email protected]@ -40,8 +42,23 @@ class horizon::params {
+         }
+       }
+     }
++    'Solaris': {
++      $logdir                      = '/var/lib/openstack_dashboard'
++      $django_wsgi                 = '/usr/lib/python2.7/vendor-packages/openstack_dashboard/wsgi/django.wsgi'
++      $manage_py                   = undef
++      $http_service                = 'network/http:apache24'
++      $config_file                 = '/etc/openstack_dashboard/local_settings.py'
++      $httpd_config_file           = '/etc/apache2/2.4/samples-conf.d/openstack-dashboard-http.conf'
++      $httpd_listen_config_file    = '/etc/apache2/2.4/httpd.conf'
++      $root_url                    = '/horizon'
++      $apache_user                 = 'webservd'
++      $apache_group                = 'webservd'
++      $wsgi_user                   = 'webservd'
++      $wsgi_group                  = 'webservd'
++      $package_name                = 'cloud/openstack/horizon'
++    }
+     default: {
+-      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
++      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily Solaris, RedHat, and Debian")
+     }
+   }
+ }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/03-init.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,81 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-horizon-6.1.0/manifests/init.pp.orig     2015-08-10 09:54:19.189649729 -0700
++++ openstack-horizon-6.1.0/manifests/init.pp     2015-08-10 09:58:21.391326841 -0700
[email protected]@ -201,6 +201,26 @@
+ #    (optional) Tuskar-UI - Deployment mode ('poc' or 'scale')
+ #    Defaults to 'scale'
+ #
++#  [*docroot*]
++#    (optional) The DocumentRoot setting
++#    Defaults to '/var/www'
++#
++#  [*static_alias*]
++#    (optional) The path to alias to /static
++#    Defaults to '/usr/share/openstack-dashboard/static'
++#
++#  [*static_root*]
++#    (optional) Absolute path to the directory in which static files
++#    should be collected
++#
++#  [*theme*]
++#    (optional) List of absolute paths which will be set as value of
++#    TEMPLATE_DIRS for theming.
++#
++#  [*overrides*]
++#    (optional) Python module to use for overrides
++#
++#
+ # === Examples
+ #
+ #  class { 'horizon':
[email protected]@ -251,6 +271,11 @@ class horizon(
+   $tuskar_ui_ironic_discoverd_url      = 'http://127.0.0.1:5050',
+   $tuskar_ui_undercloud_admin_password = undef,
+   $tuskar_ui_deployment_mode           = 'scale',
++  $docroot                             = '/var/www',
++  $static_alias                        = '/usr/share/openstack-dashboard/static',
++  $static_root                         = undef,
++  $theme                               = undef,
++  $overrides                           = undef,
+   # DEPRECATED PARAMETERS
+   $can_set_mount_point                 = undef,
+   $vhost_extra_params                  = undef,
[email protected]@ -314,18 +339,16 @@ class horizon(
+     order   => '50',
+   }
+
+-  package { 'python-lesscpy':
+-    ensure  => $package_ensure,
+-  }
+-
+-  exec { 'refresh_horizon_django_cache':
+-    command     => "${::horizon::params::manage_py} collectstatic --noinput --clear && ${::horizon::params::manage_py} compress --force",
+-    refreshonly => true,
+-    require     => [Package['python-lesscpy'], Package['horizon']],
++  if $::horizon::params::manage_py {
++    exec { 'refresh_horizon_django_cache':
++      command     => "${::horizon::params::manage_py} collectstatic --noinput --clear && ${::horizon::params::manage_py} compress --force",
++      refreshonly => true,
++      require     => [Package['python-lesscpy'], Package['horizon']],
++    }
+   }
+
+-  if $compress_offline {
+-    Concat[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache']
++  if $compress_offline and $::horizon::params::manage_py {
++     File[$::horizon::params::config_file] ~> Exec['refresh_horizon_django_cache']
+   }
+
+   if $configure_apache {
[email protected]@ -338,6 +361,8 @@ class horizon(
+       horizon_cert   => $horizon_cert,
+       horizon_key    => $horizon_key,
+       horizon_ca     => $horizon_ca,
++      docroot        => $docroot,
++      static_alias   => $static_alias,
+       extra_params   => $vhost_extra_params,
+     }
+   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/04-template.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,64 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-horizon-6.1.0/templates/local_settings.py.erb.orig	2015-06-04 08:58:10.806056356 -0600
++++ openstack-horizon-6.1.0/templates/local_settings.py.erb	2015-06-04 08:57:59.128875035 -0600
[email protected]@ -76,6 +76,9 @@ HORIZON_CONFIG = {
+     'exceptions': {'recoverable': exceptions.RECOVERABLE,
+                    'not_found': exceptions.NOT_FOUND,
+                    'unauthorized': exceptions.UNAUTHORIZED},
++<% if @overrides %>
++    'customization_module': "<%= @overrides %>"
++<% end %>
+ }
+
+ # Specify a regular expression to validate user passwords.
[email protected]@ -345,13 +348,6 @@ LOGGING = {
+             'filename': '<%= scope.lookupvar("horizon::params::logdir") %>/horizon.log',
+             'formatter': 'verbose',
+         },
+-        'syslog': {
+-            'level': '<%= @log_level %>',
+-            'facility': 'local1',
+-            'class': 'logging.handlers.SysLogHandler',
+-            'address': '/dev/log',
+-            'formatter': 'normal',
+-        }
+     },
+     'loggers': {
+         # Logging from django.db.backends is VERY verbose, send to null
[email protected]@ -574,14 +570,27 @@ LOGIN_URL = '<%= scope.lookupvar("horizo
+ LOGOUT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>/auth/logout/'
+ LOGIN_REDIRECT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>'
+
+-# The Ubuntu package includes pre-compressed JS and compiled CSS to allow
+-# offline compression by default.  To enable online compression, install
+-# the python-lesscpy package and disable the following option.
++<% if @static_root %>
++STATIC_ROOT = '<%= @static_root %>'
++<% end %>
++
++<% if @theme %>
++    <% if @theme.kind_of?(Array) %>
++TEMPLATE_DIRS = ('<%= @theme.join("', '") %>', )
++    <% else %>
++TEMPLATE_DIRS = ('<%= @theme %>', )
++    <% end %>
++<% end %>
++
++# The Ubuntu and Solaris packages includes pre-compressed JS and
++# compiled CSS to allow offline compression by default.  To enable
++# online compression, install the python-lesscpy package and disable
++# the following option.
+ COMPRESS_OFFLINE = <%= @compress_offline.to_s.capitalize %>
+
+-# For Glance image upload, Horizon uses the file upload support from Django
+-# so we add this option to change the directory where uploaded files are temporarily
+-# stored until they are loaded into Glance.
++# For Glance image upload, Horizon uses the file upload support from
++# Django so we add this option to change the directory where uploaded
++# files are temporarily stored until they are loaded into Glance.
+ FILE_UPLOAD_TEMP_DIR = '<%= @file_upload_temp_dir %>'
+
+ <% if @tuskar_ui %>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/05-apache.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,75 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-horizon-6.1.0/manifests/wsgi/apache.pp.orig       2015-08-10 09:59:25.006128695 -0700
++++ openstack-horizon-6.1.0/manifests/wsgi/apache.pp   2015-08-10 10:01:46.943370519 -0700
[email protected]@ -56,6 +56,14 @@
+ #   (Optional) Description
+ #   Defaults to 'horizon_ssl_vhost'.
+ #
++# [*docroot*]
++#   (Optional) The DocumentRoot setting
++#   Defaults to '/var/www'
++#
++# [*static_alias*]
++#   (Optional) The path to alias to /static
++#   Defaults to '/usr/share/openstack-dashboard/static'
++#
+ # [*extra_params*]
+ #   (optional) A hash of extra paramaters for apache::wsgi class.
+ #   Defaults to {}
[email protected]@ -74,6 +82,8 @@ class horizon::wsgi::apache (
+   $priority            = '15',
+   $vhost_conf_name     = 'horizon_vhost',
+   $vhost_ssl_conf_name = 'horizon_ssl_vhost',
++  $docroot             = '/var/www',
++  $static_alias        = '/usr/share/openstack-dashboard/static',
+   $extra_params        = {},
+ ) {
+
[email protected]@ -132,7 +142,11 @@ class horizon::wsgi::apache (
+     $redirect_url   = $::horizon::params::root_url
+   }
+
+-  Package['horizon'] -> Package[$::horizon::params::http_service]
++  if $::osfamily == 'Solaris' {
++    Package[$::horizon::params::package_name] -> Package['web/server/apache-24']
++  } else {
++    Package['horizon'] -> Package[$::horizon::params::http_service]
++  }
+   File[$::horizon::params::config_file] ~> Service[$::horizon::params::http_service]
+
+   $unix_user = $::osfamily ? {
[email protected]@ -150,7 +164,7 @@ class horizon::wsgi::apache (
+     group   => $unix_group,
+     before  => Service[$::horizon::params::http_service],
+     mode    => '0751',
+-    require => Package['horizon'],
++    require => Package[$::horizon::params::package_name],
+   }
+
+   file { "${::horizon::params::logdir}/horizon.log":
[email protected]@ -159,19 +173,19 @@ class horizon::wsgi::apache (
+     group   => $unix_group,
+     before  => Service[$::horizon::params::http_service],
+     mode    => '0640',
+-    require => [ File[$::horizon::params::logdir], Package['horizon'] ],
++    require => [ File[$::horizon::params::logdir], Package[$::horizon::params::package_name] ],
+   }
+
+   $default_vhost_conf_no_ip = {
+     servername                  => $servername,
+     serveraliases               => os_any2array($final_server_aliases),
+-    docroot                     => '/var/www/',
++    docroot                     => $docroot,
+     access_log_file             => 'horizon_access.log',
+     error_log_file              => 'horizon_error.log',
+     priority                    => $priority,
+     aliases                     => [{
+       alias => "${$::horizon::params::root_url}/static",
+-      path  => '/usr/share/openstack-dashboard/static',
++      path  => $static_alias,
+     }],
+     port                        => 80,
+     ssl_cert                    => $horizon_cert,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-ironic/Makefile	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		openstack-ironic
+COMPONENT_VERSION=	6.1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+    sha256:f600fe731d840eaad423b3087ecef28ee62ea4b0671574611e5de4087f1b42a2
+COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/ironic
+
+TPNO=			25373
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/puppetmodule.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+MODULE_NAME =	ironic
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-ironic/files/solaris_ipmitool.pp	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,89 @@
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# Configure the solaris_ipmitool driver in Ironic
+#
+# === Parameters
+#
+# [*server*]
+#   Host name for AI Server
+#
+# [*username*]
+#   Username to ssh to AI Server.
+#
+# [*password*]
+#   (optional) If ssh_key_file or ssh_key_contents are set, this
+#   config setting is used to provide the passphrase if required. If
+#   an encrypted key is used, set this to the passphrase.
+#
+# [*port*]
+#   (optional) SSH port to use
+#   Defaults to '22'
+#
+# [*timeout*]
+#   (optional) SSH socket timeout value in seconds.
+#   Defaults to '10'
+#
+# [*deploy_interval*]
+#   (optional) Interval in seconds to check AI deployment status.
+#   Defaults to '10'
+#
+# [*derivied_manifest*]
+#   (optional) Derived Manifest used for deployment.
+#   Defaults to 'file:///usr/lib/ironic/ironic-manifest.ksh'
+#
+# [*ssh_key_file*]
+#   (optional) SSH keyfile to use
+#
+# [*ssh_key_contents*]
+#   (optional) SSH key to use
+#
+# [*imagecache_dirname*]
+#   (optional) Default path to image cache
+#   Defaults to '/var/lib/ironic/images'
+#
+# [*imagecache_lock_timeout*]
+#   (optional) Timeout to wait when attempting to lock refcount file.
+#   Defaults to '60' seconds
+#
+class ironic::drivers::solaris_ipmitool (
+  $server,
+  $username,
+  $password             = undef,
+  $port                 = '22',
+  $timeout              = '10',
+  $deploy_interval      = '10',
+  $dervied_manifest     = 'file:///usr/lib/ironic/ironic-manifest.ksh',
+  $ssh_key_file         = undef,
+  $ssh_key_contents     = undef,
+  $imagecache_dirname   = '/var/lib/ironic/images',
+  $imagecache_lock_timeout     = '60',
+) {
+
+  # Configure ironic.conf
+  ironic_config {
+    'ai/server': value                            => $server;
+    'ai/username': value                          => $username;
+    'ai/password': value                          => $password;
+    'ai/port': value                              => $port;
+    'ai/timeout': value                           => $timeout;
+    'ai/deploy_interval': value                   => $deploy_intervael;
+    'ai/derived_manifest': value                  => $derived_manifest;
+    'ai/ssh_key_file': value                      => $ssh_key_file;
+    'ai/ssh_key_contents': value                  => $ssh_key_contents;
+    'solaris_ipmi/imagecache_dirname': value      => $imagecache_dirname;
+    'solaris_ipmi/imagecache_lock_timeout': value => $imagecache_lock_timeout;
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-ironic/openstack-ironic.license	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,187 @@
+The following applies to all products licensed under the Apache 2.0 License:
+
+You may not use the identified files except in compliance with the Apache License, Version 2.0 (the "License.")
+ 
+You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is also reproduced below.
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and limitations under the License.
+
+LICENSE:
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-ironic/openstack-ironic.p5m	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,96 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/management/puppet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="OpenStack Ironic Puppet Module"
+set name=pkg.description \
+    value="The ironic module is a thorough attempt to make Puppet capable of managing the entirety of ironic."
+set name=com.oracle.info.description value="Ironic Puppet Module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.upstream value="OpenStack <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=etc/puppet/modules/ironic/CHANGELOG.md
+file path=etc/puppet/modules/ironic/Gemfile
+file path=etc/puppet/modules/ironic/LICENSE
+file path=etc/puppet/modules/ironic/README.md
+file path=etc/puppet/modules/ironic/Rakefile
+file path=etc/puppet/modules/ironic/checksums.json
+file path=etc/puppet/modules/ironic/examples/ironic.pp
+file path=etc/puppet/modules/ironic/lib/puppet/provider/ironic.rb
+file path=etc/puppet/modules/ironic/lib/puppet/provider/ironic_config/ini_setting.rb
+file path=etc/puppet/modules/ironic/lib/puppet/type/ironic_config.rb
+file path=etc/puppet/modules/ironic/manifests/api.pp
+file path=etc/puppet/modules/ironic/manifests/client.pp
+file path=etc/puppet/modules/ironic/manifests/conductor.pp
+file path=etc/puppet/modules/ironic/manifests/db/mysql.pp
+file path=etc/puppet/modules/ironic/manifests/db/postgresql.pp
+file path=etc/puppet/modules/ironic/manifests/drivers/ipmi.pp
+file path=etc/puppet/modules/ironic/manifests/drivers/pxe.pp
+file files/solaris_ipmitool.pp \
+    path=etc/puppet/modules/ironic/manifests/drivers/solaris_ipmitool.pp
+file path=etc/puppet/modules/ironic/manifests/init.pp
+file path=etc/puppet/modules/ironic/manifests/keystone/auth.pp
+file path=etc/puppet/modules/ironic/manifests/params.pp
+file path=etc/puppet/modules/ironic/manifests/policy.pp
+file path=etc/puppet/modules/ironic/metadata.json
+file path=etc/puppet/modules/ironic/spec/acceptance/basic_ironic_spec.rb
+file path=etc/puppet/modules/ironic/spec/acceptance/nodesets/default.yml
+file path=etc/puppet/modules/ironic/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=etc/puppet/modules/ironic/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/ironic/spec/classes/ironic_api_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_client_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_conductor_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_db_mysql_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_db_postgresql_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_drivers_ipmi_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_drivers_pxe_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_init_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_keystone_auth_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_policy_spec.rb
+file path=etc/puppet/modules/ironic/spec/shared_examples.rb
+file path=etc/puppet/modules/ironic/spec/spec_helper.rb
+file path=etc/puppet/modules/ironic/spec/spec_helper_acceptance.rb
+file path=etc/puppet/modules/ironic/spec/unit/provider/ironic_spec.rb
+#
+license openstack-ironic.license license="Apache v2.0"
+
+# force a dependency on openstack-keystone
+depend type=require fmri=system/management/puppet/openstack-keystone
+
+# force a dependency on openstack-openstacklib
+depend type=require fmri=system/management/puppet/openstack-openstacklib
+
+# force a dependency on puppetlabs-inifile
+depend type=require fmri=system/management/puppet/puppetlabs-inifile
+
+# force a dependency on puppetlabs-stdlib
+depend type=require fmri=system/management/puppet/puppetlabs-stdlib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-ironic/patches/01-metadata.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,20 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-ironic-6.1.0/metadata.json.orig   2015-10-15 09:13:06.053621516 -0700
++++ openstack-ironic-6.1.0/metadata.json       2015-10-15 09:13:22.352759889 -0700
[email protected]@ -49,6 +49,13 @@
+         "12.04",
+         "14.04"
+       ]
++    },
++    {
++      "operatingsystem": "Solaris",
++      "operatingsystemrelease": [
++        "11.3",
++        "12.0"
++      ]
+     }
+   ],
+   "description": "Installs and configures OpenStack Ironic (Bare metal)."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-ironic/patches/02-params.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,21 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-ironic-6.1.0/manifests/params.pp.orig	2015-06-03 09:47:53.207517414 -0600
++++ openstack-ironic-6.1.0/manifests/params.pp	2015-06-03 09:49:30.640143302 -0600
[email protected]@ -40,6 +40,14 @@ class ironic::params {
+       $conductor_package   = 'ironic-conductor'
+       $client_package      = 'python-ironicclient'
+     }
++    'Solaris': {
++      $common_package_name = 'cloud/openstack/ironic'
++      $api_service         = 'application/openstack/ironic/ironic-api:default'
++      $api_package         = undef
++      $conductor_service   = 'application/openstack/ironic/ironic-conductor:default'
++      $conductor_package   = undef
++      $client_package      = 'library/python/ironicclient'
++    }
+     default: {
+       fail("Unsupported osfamily ${::osfamily}")
+     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-keystone/Makefile	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		openstack-keystone
+COMPONENT_VERSION=	6.1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+    sha256:fb17106a8f79bad3ae5cd9b321361e3f434c7bd2903c62a2c8d5428edf664b2d
+COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/keystone
+
+TPNO=			25375
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/puppetmodule.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+MODULE_NAME =	keystone
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-keystone/openstack-keystone.license	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,190 @@
+Copyright 2012 OpenStack Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============================================================
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-keystone/openstack-keystone.p5m	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,150 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/management/puppet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="OpenStack Keystone Puppet Module"
+set name=pkg.description \
+    value="The keystone module is a thorough attempt to make Puppet capable of managing the entirety of keystone.  This includes manifests to provision region specific endpoint and database connections.  Types are shipped as part of the keystone module to assist in manipulation of configuration files."
+set name=com.oracle.info.description value="Keystone Puppet Module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.repository-changeset value=$(GIT_COMMIT_ID)
+set name=info.repository-url value=$(GIT_REPO)
+set name=info.upstream value="OpenStack <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=etc/puppet/modules/keystone/CHANGELOG.md
+file path=etc/puppet/modules/keystone/Gemfile
+file path=etc/puppet/modules/keystone/LICENSE
+file path=etc/puppet/modules/keystone/README.md
+file path=etc/puppet/modules/keystone/Rakefile
+file path=etc/puppet/modules/keystone/checksums.json
+file path=etc/puppet/modules/keystone/examples/apache_dropin.pp
+file path=etc/puppet/modules/keystone/examples/apache_with_paths.pp
+file path=etc/puppet/modules/keystone/examples/ldap_full.pp
+file path=etc/puppet/modules/keystone/examples/ldap_identity.pp
+file path=etc/puppet/modules/keystone/examples/v3_basic.pp
+file path=etc/puppet/modules/keystone/ext/keystone_test.rb
+file path=etc/puppet/modules/keystone/ext/keystone_test_v3.rb
+file path=etc/puppet/modules/keystone/files/httpd/keystone.py
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone/util.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_config/ini_setting.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_domain/openstack.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_endpoint/openstack.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_paste_ini/ini_setting.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_role/openstack.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_service/openstack.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_tenant/openstack.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_user/openstack.rb
+file path=etc/puppet/modules/keystone/lib/puppet/provider/keystone_user_role/openstack.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_config.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_domain.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_endpoint.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_paste_ini.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_role.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_service.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_tenant.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_user.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_user_role.rb
+file path=etc/puppet/modules/keystone/manifests/client.pp
+file path=etc/puppet/modules/keystone/manifests/config.pp
+file path=etc/puppet/modules/keystone/manifests/cron/token_flush.pp
+file path=etc/puppet/modules/keystone/manifests/db/mysql.pp
+file path=etc/puppet/modules/keystone/manifests/db/postgresql.pp
+file path=etc/puppet/modules/keystone/manifests/db/sync.pp
+file path=etc/puppet/modules/keystone/manifests/dev/install.pp
+file path=etc/puppet/modules/keystone/manifests/endpoint.pp
+file path=etc/puppet/modules/keystone/manifests/init.pp
+file path=etc/puppet/modules/keystone/manifests/ldap.pp
+file path=etc/puppet/modules/keystone/manifests/logging.pp
+file path=etc/puppet/modules/keystone/manifests/params.pp
+file path=etc/puppet/modules/keystone/manifests/policy.pp
+file path=etc/puppet/modules/keystone/manifests/python.pp
+file path=etc/puppet/modules/keystone/manifests/resource/authtoken.pp
+file path=etc/puppet/modules/keystone/manifests/resource/service_identity.pp
+file path=etc/puppet/modules/keystone/manifests/roles/admin.pp
+file path=etc/puppet/modules/keystone/manifests/service.pp
+file path=etc/puppet/modules/keystone/manifests/wsgi/apache.pp
+file path=etc/puppet/modules/keystone/metadata.json
+file path=etc/puppet/modules/keystone/spec/acceptance/basic_keystone_spec.rb
+file path=etc/puppet/modules/keystone/spec/acceptance/keystone_wsgi_apache_spec.rb
+file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/default.yml
+file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/keystone/spec/classes/keystone_client_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_cron_token_flush_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_db_mysql_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_db_postgresql_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_endpoint_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_ldap_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_logging_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_policy_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_python_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_service_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_wsgi_apache_spec.rb
+file path=etc/puppet/modules/keystone/spec/defines/keystone_resource_authtoken_spec.rb
+file path=etc/puppet/modules/keystone/spec/defines/keystone_resource_service_identity_spec.rb
+file path=etc/puppet/modules/keystone/spec/shared_examples.rb
+file path=etc/puppet/modules/keystone/spec/spec.opts
+file path=etc/puppet/modules/keystone/spec/spec_helper.rb
+file path=etc/puppet/modules/keystone/spec/spec_helper_acceptance.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone/util_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_domain/openstack_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_endpoint/openstack_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_paste_ini/ini_setting_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_role/openstack_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_service/openstack_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_tenant/openstack_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_user/openstack_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/provider/keystone_user_role/openstack_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/type/keystone_endpoint_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/type/keystone_paste_ini_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/type/keystone_tenant_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/type/keystone_user_role_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/type/keystone_user_spec.rb
+file path=etc/puppet/modules/keystone/tests/site.pp
+#
+license openstack-keystone.license license="Apache v2.0"
+
+# force a dependency on openstack-openstacklib
+depend type=require fmri=system/management/puppet/openstack-openstacklib
+
+# force a dependency on puppetlabs-apache
+depend type=require fmri=system/management/puppet/puppetlabs-apache
+
+# force a dependency on puppetlabs-inifile
+depend type=require fmri=system/management/puppet/puppetlabs-inifile
+
+# force a dependency on puppetlabs-stdlib
+depend type=require fmri=system/management/puppet/puppetlabs-stdlib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/01-metadata.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,20 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-keystone-6.1.0/metadata.json.orig   2015-10-15 09:15:58.784387200 -0700
++++ openstack-keystone-6.1.0/metadata.json       2015-10-15 09:16:20.060854398 -0700
[email protected]@ -49,6 +49,13 @@
+         "12.04",
+         "14.04"
+       ]
++    },
++    {
++      "operatingsystem": "Solaris",
++      "operatingsystemrelease": [
++        "11.3",
++        "12.0"
++      ]
+     }
+   ],
+   "description": "Installs and configures OpenStack Keystone (Identity)."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/02-params.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,40 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+--- openstack-keystone-6.1.0/manifests/params.pp.~1~	2015-05-20 15:52:29.000000000 -0600
++++ openstack-keystone-6.1.0/manifests/params.pp	2015-06-01 13:41:27.577020809 -0600
[email protected]@ -2,10 +2,10 @@
+ # This class contains the platform differences for keystone
+ #
+ class keystone::params {
+-  $client_package_name = 'python-keystone'
+ 
+   case $::osfamily {
+     'Debian': {
++      $client_package_name          = 'python-keystone'
+       $package_name                 = 'keystone'
+       $service_name                 = 'keystone'
+       $keystone_wsgi_script_path    = '/usr/lib/cgi-bin/keystone'
[email protected]@ -26,6 +26,7 @@ class keystone::params {
+       }
+     }
+     'RedHat': {
++      $client_package_name          = 'python-keystone'
+       $package_name                 = 'openstack-keystone'
+       $service_name                 = 'openstack-keystone'
+       $keystone_wsgi_script_path    = '/var/www/cgi-bin/keystone'
[email protected]@ -34,5 +35,14 @@ class keystone::params {
+       $keystone_wsgi_script_source  = '/usr/share/keystone/keystone.wsgi'
+       $paste_config                 = '/usr/share/keystone/keystone-dist-paste.ini'
+     }
++    'Solaris': {
++      $client_package_name          = 'library/python/keystoneclient'
++      $package_name                 = 'cloud/openstack/keystone'
++      $service_name                 = 'application/openstack/keystone:default'
++      $keystone_wsgi_script_path    = undef
++      $python_memcache_package_name = 'python-memcached'
++      $service_provider             = undef
++      $paste_config                 = undef
++    }
+   }
+ }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/03-init.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,25 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-keystone-6.1.0/manifests/init.pp.orig     2015-08-10 10:07:52.618276233 -0700
++++ openstack-keystone-6.1.0/manifests/init.pp     2015-08-10 10:08:50.923010629 -0700
[email protected]@ -544,18 +544,12 @@ class keystone(
+
+   file { ['/etc/keystone', '/var/log/keystone', '/var/lib/keystone']:
+     ensure  => directory,
+-    mode    => '0750',
+-    owner   => 'keystone',
+-    group   => 'keystone',
+     require => Package['keystone'],
+     notify  => Service[$service_name],
+   }
+
+   file { '/etc/keystone/keystone.conf':
+     ensure  => present,
+-    mode    => '0600',
+-    owner   => 'keystone',
+-    group   => 'keystone',
+     require => Package['keystone'],
+     notify  => Service[$service_name],
+   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/04-client.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,25 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-keystone-6.1.0/manifests/client.pp.orig	2015-11-02 08:01:00.540540751 -0800
++++ openstack-keystone-6.1.0/manifests/client.pp	2015-11-02 08:05:26.947491915 -0800
[email protected]@ -12,8 +12,15 @@ class keystone::client (
+   $ensure = 'present'
+ ) {
+ 
+-  package { 'python-keystoneclient':
+-    ensure => $ensure,
+-    tag    => 'openstack',
++  if $::osfamily == 'Solaris' {
++    package { 'library/python/keystoneclient':
++      ensure => $ensure,
++      tag    => 'openstack',
++    }
++  } else {
++    package { 'python-keystoneclient':
++      ensure => $ensure,
++      tag    => 'openstack',
++    }
+   }
+ }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/Makefile	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		openstack-neutron
+COMPONENT_VERSION=	6.1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+    sha256:fc45e22bc9cf2a373e53b5d27dcce132a705d39f086522f841d550739855186a
+COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/neutron
+
+TPNO=			25376
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/puppetmodule.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+MODULE_NAME =	neutron
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/files/evs.pp	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,22 @@
+# == Class: neutron::plugins::evs
+#
+# Sets up EVS plugin for neutron server.
+#
+# === Parameters
+#
+# [*evs_controller*]
+#   URI specifying an EVS controller.
+#   Defaults to 'ssh://[email protected]'
+#
+class neutron::plugins::evs (
+  $evs_controller      = 'ssh://[email protected]',
+) {
+
+  ini_setting { 'evs_plugin':
+    ensure    => present,
+    path      => '/etc/neutron/plugins/evs/evs_plugin.ini',
+    section   => 'EVS',
+    setting   => 'evs_controller',
+    value     => $evs_controller,
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/openstack-neutron.license	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,175 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/openstack-neutron.p5m	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,219 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/management/puppet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="OpenStack Neutron Puppet Module"
+set name=pkg.description \
+    value="The neutron module is an attempt to make Puppet capable of managing the entirety of neutron. This includes manifests to provision such things as keystone endpoints, RPC configurations specific to neutron, database connections, and network driver plugins. Types are shipped as part of the neutron module to assist in manipulation of the Openstack configuration files."
+set name=com.oracle.info.description value="Neutron Puppet Module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.upstream value="OpenStack <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=etc/puppet/modules/neutron/CHANGELOG.md
+file path=etc/puppet/modules/neutron/Gemfile
+file path=etc/puppet/modules/neutron/LICENSE
+file path=etc/puppet/modules/neutron/README.md
+file path=etc/puppet/modules/neutron/Rakefile
+file path=etc/puppet/modules/neutron/checksums.json
+file path=etc/puppet/modules/neutron/examples/base_provision.pp
+file path=etc/puppet/modules/neutron/examples/create_network.sh
+file path=etc/puppet/modules/neutron/examples/neutron.pp
+file path=etc/puppet/modules/neutron/examples/neutron_with_pacemaker.pp
+file path=etc/puppet/modules/neutron/lib/puppet/parser/functions/validate_network_vlan_ranges.rb
+file path=etc/puppet/modules/neutron/lib/puppet/parser/functions/validate_tunnel_id_ranges.rb
+file path=etc/puppet/modules/neutron/lib/puppet/parser/functions/validate_vni_ranges.rb
+file path=etc/puppet/modules/neutron/lib/puppet/parser/functions/validate_vxlan_udp_port.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_ovs/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_api_config/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_config/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_dhcp_agent_config/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_fwaas_service_config/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_l3_ovs_bridge/neutron.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_lbaas_agent_config/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_metadata_agent_config/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_metering_agent_config/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_network/neutron.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco_credentials/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco_db_conn/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_cisco_l2network/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_linuxbridge/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_midonet/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_ml2/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_nvp/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_opencontrail/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_ovs/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plugin_plumgrid/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_plumlib_plumgrid/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_port/neutron.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_router/neutron.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_router_interface/neutron.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_subnet/neutron.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_vpnaas_agent_config/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/nova_admin_tenant_id_setter/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_agent_linuxbridge.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_agent_ovs.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_api_config.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_config.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_dhcp_agent_config.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_fwaas_service_config.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_l3_agent_config.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_l3_ovs_bridge.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_lbaas_agent_config.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_metadata_agent_config.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_metering_agent_config.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_network.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco_credentials.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco_db_conn.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_cisco_l2network.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_linuxbridge.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_midonet.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_ml2.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_nvp.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_opencontrail.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_ovs.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plugin_plumgrid.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_plumlib_plumgrid.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_port.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_router.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_router_interface.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_subnet.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/neutron_vpnaas_agent_config.rb
+file path=etc/puppet/modules/neutron/lib/puppet/type/nova_admin_tenant_id_setter.rb
+file path=etc/puppet/modules/neutron/manifests/agents/dhcp.pp
+file path=etc/puppet/modules/neutron/manifests/agents/l3.pp
+file path=etc/puppet/modules/neutron/manifests/agents/lbaas.pp
+file path=etc/puppet/modules/neutron/manifests/agents/metadata.pp
+file path=etc/puppet/modules/neutron/manifests/agents/metering.pp
+file path=etc/puppet/modules/neutron/manifests/agents/ml2/linuxbridge.pp
+file path=etc/puppet/modules/neutron/manifests/agents/ml2/ovs.pp
+file path=etc/puppet/modules/neutron/manifests/agents/ml2/sriov.pp
+file path=etc/puppet/modules/neutron/manifests/agents/n1kv_vem.pp
+file path=etc/puppet/modules/neutron/manifests/agents/vpnaas.pp
+file path=etc/puppet/modules/neutron/manifests/client.pp
+file path=etc/puppet/modules/neutron/manifests/config.pp
+file path=etc/puppet/modules/neutron/manifests/db/mysql.pp
+file path=etc/puppet/modules/neutron/manifests/db/postgresql.pp
+file path=etc/puppet/modules/neutron/manifests/init.pp
+file path=etc/puppet/modules/neutron/manifests/keystone/auth.pp
+file path=etc/puppet/modules/neutron/manifests/params.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/cisco.pp
+file files/evs.pp path=etc/puppet/modules/neutron/manifests/plugins/evs.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/midonet.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus1000v.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus_creds.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/mech_driver.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/type_driver.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/nvp.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/opencontrail.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ovs/bridge.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ovs/port.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/plumgrid.pp
+file path=etc/puppet/modules/neutron/manifests/policy.pp
+file path=etc/puppet/modules/neutron/manifests/quota.pp
+file path=etc/puppet/modules/neutron/manifests/server.pp
+file path=etc/puppet/modules/neutron/manifests/server/notifications.pp
+file path=etc/puppet/modules/neutron/manifests/services/fwaas.pp
+file path=etc/puppet/modules/neutron/metadata.json
+file path=etc/puppet/modules/neutron/spec/acceptance/basic_neutron_spec.rb
+file path=etc/puppet/modules/neutron/spec/acceptance/nodesets/default.yml
+file path=etc/puppet/modules/neutron/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=etc/puppet/modules/neutron/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_dhcp_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_l3_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_lbaas_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_metadata_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_metering_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_ml2_linuxbridge_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_ml2_ovs_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_ml2_sriov_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_n1kv_vem_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_vpnaas_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_client_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_db_mysql_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_db_postgresql_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_init_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_keystone_auth_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_cisco_ml2_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_cisco_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_midonet_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_nvp_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_opencontrail_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_plumgrid_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_policy_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_quota_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_server_notifications_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_server_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_services_fwaas_spec.rb
+file path=etc/puppet/modules/neutron/spec/shared_examples.rb
+file path=etc/puppet/modules/neutron/spec/spec_helper.rb
+file path=etc/puppet/modules/neutron/spec/spec_helper_acceptance.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_agent_linuxbridge/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_agent_ovs/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_l3_ovs_bridge/neutron_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_network/neutron_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_opencontrail/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_plumgrid/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plumlib_plumgrid/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_port/neutron_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_router/neutron_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_router_interface/neutron_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_router_interface/new_neutron_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_subnet/neutron_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/nova_admin_tenant_id_setter/neutron_spec.rb
+file path=etc/puppet/modules/neutron/templates/ml2_conf_cisco.ini.erb
+file path=etc/puppet/modules/neutron/templates/n1kv.conf.erb
+#
+license openstack-neutron.license license="Apache v2.0"
+
+# force a dependency on openstack-keystone
+depend type=require fmri=system/management/puppet/openstack-keystone
+
+# force a dependency on openstack-nova
+depend type=require fmri=system/management/puppet/openstack-nova
+
+# force a dependency on openstack-openstacklib
+depend type=require fmri=system/management/puppet/openstack-openstacklib
+
+# force a dependency on puppetlabs-inifile
+depend type=require fmri=system/management/puppet/puppetlabs-inifile
+
+# force a dependency on puppetlabs-stdlib
+depend type=require fmri=system/management/puppet/puppetlabs-stdlib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/01-metadata.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,29 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-neutron-6.1.0/metadata.json.orig   2015-10-15 09:20:19.959096430 -0700
++++ openstack-neutron-6.1.0/metadata.json       2015-10-15 09:20:34.921195088 -0700
[email protected]@ -12,8 +12,6 @@
+     {"name":"openstack/keystone","version_requirement":">=6.0.0 <7.0.0"},
+     {"name":"openstack/nova","version_requirement":">=6.0.0 <7.0.0"},
+     {"name":"puppetlabs/stdlib","version_requirement":">=4.0.0 <5.0.0"},
+-    {"name":"openstack/vswitch","version_requirement":">=2.0.0 <3.0.0"},
+-    {"name":"duritong/sysctl","version_requirement":">=0.0.1 <1.0.0"},
+     {"name":"openstack/openstacklib","version_requirement":">=6.0.0 <7.0.0"}
+   ],
+   "requirements": [
[email protected]@ -52,6 +50,13 @@
+         "12.04",
+         "14.04"
+       ]
++    },
++    {
++      "operatingsystem": "Solaris",
++      "operatingsystemrelease": [
++        "11.3",
++        "12.0"
++      ]
+     }
+   ],
+   "description": "Installs and configures OpenStack Neutron (Networking)."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/02-params.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,63 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-neutron-6.1.0/manifests/params.pp.orig	2015-05-29 10:42:11.939016221 -0600
++++ openstack-neutron-6.1.0/manifests/params.pp	2015-05-29 10:55:54.281048159 -0600
[email protected]@ -153,6 +153,56 @@ class neutron::params {
+     $cliff_package      = 'python-cliff'
+     $kernel_headers     = "linux-headers-${::kernelrelease}"
+ 
++  } elsif($::osfamily == 'Solaris') {
++    $nobody_user_group   = 'nobody'
++    $package_name        = 'cloud/openstack/neutron'
++    $server_service      = 'application/openstack/neutron/neutron-server:default'
++    $client_package      = 'library/python/neutronclient'
++    $ml2_server_package  = false
++    $ovs_agent_package   = false
++    $ovs_agent_service   = false
++    $ovs_server_package  = false
++    $ovs_cleanup_service = false
++    $ovs_package         = false
++    $libnl_package       = false
++    $package_provider    = 'pkg'
++
++    $linuxbridge_agent_package  = false
++    $linuxbridge_agent_service  = false
++    $linuxbridge_server_package = false
++    $linuxbridge_config_file    = false
++
++    $cisco_server_package  = false
++    $cisco_config_file     = false
++    $cisco_ml2_config_file = false
++
++    $nvp_server_package = false
++
++    $dhcp_agent_package = false
++    $dhcp_agent_service = 'application/openstack/neutron/neutron-dhcp-agent:default'
++
++    $dnsmasq_packages   = 'service/network/dnsmasq'
++
++    $lbaas_agent_package = false
++    $lbaas_agent_service = false
++
++    $haproxy_package   = false
++
++    $metering_agent_package = false
++    $metering_agent_service = false
++
++    $vpnaas_agent_package = false
++    $vpnaas_agent_service = false
++    $openswan_package     = false
++
++    $l3_agent_package   = false
++    $l3_agent_service   = 'application/openstack/neutron/neutron-l3-agent:default'
++
++    $metadata_agent_service = 'application/openstack/neutron/neutron-metadata-agent:default'
++
++    $cliff_package      = 'library/python/cliff'
++
++    $kernel_headers     = false
+   } else {
+ 
+     fail("Unsupported osfamily ${::osfamily}")
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/03-init.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,55 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-neutron-6.1.0/manifests/init.pp.orig     2015-08-10 10:15:41.992660410 -0700
++++ openstack-neutron-6.1.0/manifests/init.pp     2015-08-10 10:16:24.401836047 -0700
[email protected]@ -235,7 +235,7 @@ class neutron (
+   $allow_sorting               = false,
+   $allow_overlapping_ips       = false,
+   $api_extensions_path         = undef,
+-  $root_helper                 = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
++  $root_helper                 = undef,
+   $report_interval             = '30',
+   $memcache_servers            = false,
+   $control_exchange            = 'neutron',
[email protected]@ -312,18 +312,6 @@ class neutron (
+     validate_array($memcache_servers)
+   }
+
+-  File {
+-    require => Package['neutron'],
+-    owner   => 'root',
+-    group   => 'neutron',
+-  }
+-
+-  file { '/etc/neutron':
+-    ensure => directory,
+-  }
+-
+-  file { '/etc/neutron/neutron.conf': }
+-
+   package { 'neutron':
+     ensure => $package_ensure,
+     name   => $::neutron::params::package_name,
[email protected]@ -351,7 +339,6 @@ class neutron (
+     'DEFAULT/api_extensions_path':     value => $api_extensions_path;
+     'DEFAULT/state_path':              value => $state_path;
+     'DEFAULT/lock_path':               value => $lock_path;
+-    'agent/root_helper':               value => $root_helper;
+     'agent/report_interval':           value => $report_interval;
+   }
+
[email protected]@ -374,6 +361,12 @@ class neutron (
+     }
+   }
+
++  if $root_helper {
++    neutron_config {
++      'agent/root_helper':               value => $root_helper;
++    }
++  }
++
+   if $network_device_mtu {
+     neutron_config {
+       'DEFAULT/network_device_mtu':           value => $network_device_mtu;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-nova/Makefile	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		openstack-nova
+COMPONENT_VERSION=	6.1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+    sha256:68c8140301cfe5e4d873b57ec26ed67504a3816b15e851b8a3dedbc7ea3d53d6
+COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/nova
+
+TPNO=			25377
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/puppetmodule.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+MODULE_NAME =	nova
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-nova/files/solaris_zones.pp	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,30 @@
+#
+# == Class: nova::compute::solaris_zones
+#
+# Configures nova-compute to manage Solaris Zone guests
+#
+# === Parameters
+#
+# [*glancecache_dirname*]
+#   (optional) Default path to local image cache.
+#   Defaults to $state_path/images
+#
+# [*solariszones_snapshots_directory*]
+#   (optional) Location where solariszones driver will store instance
+#   snapshots before uploading them to Glance
+#   Defaults to $instances_path/snapshots
+#
+class nova::compute::solaris_zones(
+    $glancecache_dirname='$state_path/images',
+    $solariszones_snapshots_directory='$instances_path/snapshots',
+) {
+
+  nova_config {
+    'DEFAULT/glancecache_dirname':   value => $glancecache_dirname;
+    'DEFAULT/solariszones_snapshots_directory':   value => $solariszones_snapshots_directory;
+    'DEFAULT/compute_driver':        value => 'solariszones.SolarisZonesDriver';
+    'DEFAULT/pybasedir':             value => '/usr/lib/python2.7/vendor-packages';
+    'DEFAULT/fping_path':            value => '/usr/bin/fping';
+    'DEFAULT/network_driver':        value => 'nova.network.solaris_net';
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-nova/openstack-nova.license	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,190 @@
+Copyright 2012 OpenStack Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============================================================
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-nova/openstack-nova.p5m	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,192 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/management/puppet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="OpenStack Nova Puppet Module"
+set name=pkg.description \
+    value="The nova module is a thorough attempt to make Puppet capable of managing the entirety of nova.  This includes manifests to provision such things as keystone endpoints, RPC configurations specific to nova, and database connections.  Types are shipped as part of the nova module to assist in manipulation of configuration files."
+set name=com.oracle.info.description value="Nova Puppet Module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.upstream value="OpenStack <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=etc/puppet/modules/nova/CHANGELOG.md
+file path=etc/puppet/modules/nova/Gemfile
+file path=etc/puppet/modules/nova/LICENSE
+file path=etc/puppet/modules/nova/README.md
+file path=etc/puppet/modules/nova/Rakefile
+file path=etc/puppet/modules/nova/checksums.json
+file path=etc/puppet/modules/nova/examples/nova_with_pacemaker.pp
+file path=etc/puppet/modules/nova/lib/puppet/parser/functions/check_array_of_hash.rb
+file path=etc/puppet/modules/nova/lib/puppet/provider/nova.rb
+file path=etc/puppet/modules/nova/lib/puppet/provider/nova_aggregate/nova.rb
+file path=etc/puppet/modules/nova/lib/puppet/provider/nova_cells/nova_manage.rb
+file path=etc/puppet/modules/nova/lib/puppet/provider/nova_config/ini_setting.rb
+file path=etc/puppet/modules/nova/lib/puppet/provider/nova_floating/nova_manage.rb
+file path=etc/puppet/modules/nova/lib/puppet/provider/nova_network/nova_manage.rb
+file path=etc/puppet/modules/nova/lib/puppet/provider/nova_paste_api_ini/ini_setting.rb
+file path=etc/puppet/modules/nova/lib/puppet/type/nova_aggregate.rb
+file path=etc/puppet/modules/nova/lib/puppet/type/nova_cells.rb
+file path=etc/puppet/modules/nova/lib/puppet/type/nova_config.rb
+file path=etc/puppet/modules/nova/lib/puppet/type/nova_floating.rb
+file path=etc/puppet/modules/nova/lib/puppet/type/nova_network.rb
+file path=etc/puppet/modules/nova/lib/puppet/type/nova_paste_api_ini.rb
+file path=etc/puppet/modules/nova/manifests/api.pp
+file path=etc/puppet/modules/nova/manifests/cells.pp
+file path=etc/puppet/modules/nova/manifests/cert.pp
+file path=etc/puppet/modules/nova/manifests/client.pp
+file path=etc/puppet/modules/nova/manifests/compute.pp
+file path=etc/puppet/modules/nova/manifests/compute/ironic.pp
+file path=etc/puppet/modules/nova/manifests/compute/libvirt.pp
+file path=etc/puppet/modules/nova/manifests/compute/neutron.pp
+file path=etc/puppet/modules/nova/manifests/compute/rbd.pp
+file path=etc/puppet/modules/nova/manifests/compute/serial.pp
+file files/solaris_zones.pp \
+    path=etc/puppet/modules/nova/manifests/compute/solaris_zones.pp
+file path=etc/puppet/modules/nova/manifests/compute/spice.pp
+file path=etc/puppet/modules/nova/manifests/compute/vmware.pp
+file path=etc/puppet/modules/nova/manifests/compute/xenserver.pp
+file path=etc/puppet/modules/nova/manifests/conductor.pp
+file path=etc/puppet/modules/nova/manifests/config.pp
+file path=etc/puppet/modules/nova/manifests/consoleauth.pp
+file path=etc/puppet/modules/nova/manifests/cron/archive_deleted_rows.pp
+file path=etc/puppet/modules/nova/manifests/db.pp
+file path=etc/puppet/modules/nova/manifests/db/mysql.pp
+file path=etc/puppet/modules/nova/manifests/db/postgresql.pp
+file path=etc/puppet/modules/nova/manifests/generic_service.pp
+file path=etc/puppet/modules/nova/manifests/init.pp
+file path=etc/puppet/modules/nova/manifests/keystone/auth.pp
+file path=etc/puppet/modules/nova/manifests/logging.pp
+file path=etc/puppet/modules/nova/manifests/manage/cells.pp
+file path=etc/puppet/modules/nova/manifests/manage/floating.pp
+file path=etc/puppet/modules/nova/manifests/manage/network.pp
+file path=etc/puppet/modules/nova/manifests/migration/libvirt.pp
+file path=etc/puppet/modules/nova/manifests/network.pp
+file path=etc/puppet/modules/nova/manifests/network/bridge.pp
+file path=etc/puppet/modules/nova/manifests/network/flat.pp
+file path=etc/puppet/modules/nova/manifests/network/flatdhcp.pp
+file path=etc/puppet/modules/nova/manifests/network/neutron.pp
+file path=etc/puppet/modules/nova/manifests/network/vlan.pp
+file path=etc/puppet/modules/nova/manifests/objectstore.pp
+file path=etc/puppet/modules/nova/manifests/params.pp
+file path=etc/puppet/modules/nova/manifests/policy.pp
+file path=etc/puppet/modules/nova/manifests/qpid.pp
+file path=etc/puppet/modules/nova/manifests/quota.pp
+file path=etc/puppet/modules/nova/manifests/rabbitmq.pp
+file path=etc/puppet/modules/nova/manifests/scheduler.pp
+file path=etc/puppet/modules/nova/manifests/scheduler/filter.pp
+file path=etc/puppet/modules/nova/manifests/serialproxy.pp
+file path=etc/puppet/modules/nova/manifests/spicehtml5proxy.pp
+file path=etc/puppet/modules/nova/manifests/utilities.pp
+file path=etc/puppet/modules/nova/manifests/vncproxy.pp
+file path=etc/puppet/modules/nova/manifests/vncproxy/common.pp
+file path=etc/puppet/modules/nova/metadata.json
+file path=etc/puppet/modules/nova/spec/acceptance/basic_nova_spec.rb
+file path=etc/puppet/modules/nova/spec/acceptance/nodesets/default.yml
+file path=etc/puppet/modules/nova/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=etc/puppet/modules/nova/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/nova/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=etc/puppet/modules/nova/spec/classes/nova_api_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_cells_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_cert_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_client_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_compute_ironic_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_compute_libvirt_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_compute_neutron_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_compute_rbd_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_compute_serial_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_compute_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_compute_spice_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_compute_vmware_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_compute_xenserver_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_conductor_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_config_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_consoleauth_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_cron_archive_deleted_rows_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_db_mysql_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_db_postgresql_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_db_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_init_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_keystone_endpoint_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_logging_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_migration_libvirt_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_network_flat_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_network_flatdhcp_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_network_neutron_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_network_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_network_vlan_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_objectstore_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_policy_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_qpid_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_quota_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_rabbitmq_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_scheduler_filter_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_scheduler_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_serial_proxy_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_spicehtml5_proxy_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_utilities_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_vnc_proxy_spec.rb
+file path=etc/puppet/modules/nova/spec/defines/nova_generic_service_spec.rb
+file path=etc/puppet/modules/nova/spec/defines/nova_manage_networks_spec.rb
+file path=etc/puppet/modules/nova/spec/fixtures/manifests/site.pp
+file path=etc/puppet/modules/nova/spec/hosts/test-001_spec.rb
+file path=etc/puppet/modules/nova/spec/shared_examples.rb
+file path=etc/puppet/modules/nova/spec/spec_helper.rb
+file path=etc/puppet/modules/nova/spec/spec_helper_acceptance.rb
+file path=etc/puppet/modules/nova/spec/type/nova_aggregate_spec.rb
+file path=etc/puppet/modules/nova/spec/unit/provider/nova_config/ini_setting_spec.rb
+file path=etc/puppet/modules/nova/spec/unit/provider/nova_spec.rb
+file path=etc/puppet/modules/nova/spec/unit/type/nova_config_spec.rb
+file path=etc/puppet/modules/nova/spec/unit/type/nova_network_spec.rb
+file path=etc/puppet/modules/nova/templates/secret.xml-compute.erb
+#
+license openstack-nova.license license="Apache v2.0"
+
+# force a dependency on openstack-cinder
+depend type=require fmri=system/management/puppet/openstack-cinder
+
+# force a dependency on openstack-glance
+depend type=require fmri=system/management/puppet/openstack-glance
+
+# force a dependency on openstack-keystone
+depend type=require fmri=system/management/puppet/openstack-keystone
+
+# force a dependency on openstack-openstacklib
+depend type=require fmri=system/management/puppet/openstack-openstacklib
+
+# force a dependency on puppetlabs-inifile
+depend type=require fmri=system/management/puppet/puppetlabs-inifile
+
+# force a dependency on puppetlabs-rabbitmq
+depend type=require fmri=system/management/puppet/puppetlabs-rabbitmq
+
+# force a dependency on puppetlabs-stdlib
+depend type=require fmri=system/management/puppet/puppetlabs-stdlib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-nova/patches/01-metadata.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,29 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-nova-6.1.0/metadata.json.orig   2015-10-15 09:23:28.760348010 -0700
++++ openstack-nova-6.1.0/metadata.json       2015-10-15 09:23:50.802116009 -0700
[email protected]@ -8,8 +8,6 @@
+   "project_page": "https://launchpad.net/puppet-nova",
+   "issues_url": "https://bugs.launchpad.net/puppet-nova",
+   "dependencies": [
+-    {"name":"dprince/qpid","version_requirement":">=1.0.0 <2.0.0"},
+-    {"name":"duritong/sysctl","version_requirement":">=0.0.1 <1.0.0"},
+     {"name":"openstack/cinder","version_requirement":">=6.0.0 <7.0.0"},
+     {"name":"openstack/glance","version_requirement":">=6.0.0 <7.0.0"},
+     {"name":"puppetlabs/inifile","version_requirement":">=1.0.0 <2.0.0"},
[email protected]@ -54,6 +52,13 @@
+         "12.04",
+         "14.04"
+       ]
++    },
++    {
++      "operatingsystem": "Solaris",
++      "operatingsystemrelease": [
++        "11.3",
++        "12.0"
++      ]
+     }
+   ],
+   "description": "Installs and configures OpenStack Nova (Compute)."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-nova/patches/02-params.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,47 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-nova-6.1.0/manifests/params.pp.orig	2015-07-07 12:24:18.609643411 -0700
++++ openstack-nova-6.1.0/manifests/params.pp	2015-07-07 12:24:51.583277575 -0700
[email protected]@ -116,8 +116,39 @@ class nova::params {
+         }
+       }
+     }
++    'Solaris': {
++      # package names
++      $api_package_name             = 'cloud/openstack/nova'
++      $cells_package_name           = 'cloud/openstack/nova'
++      $cert_package_name            = 'cloud/openstack/nova'
++      $common_package_name          = 'cloud/openstack/nova'
++      $compute_package_name         = 'cloud/openstack/nova'
++      $conductor_package_name       = 'cloud/openstack/nova'
++      $consoleauth_package_name     = 'cloud/openstack/nova'
++      $doc_package_name             = 'cloud/openstack/nova'
++      $network_package_name         = 'cloud/openstack/nova'
++      $numpy_package_name           = 'python-extra-27'
++      $objectstore_package_name     = 'cloud/openstack/nova'
++      $scheduler_package_name       = 'cloud/openstack/nova'
++      $tgt_package_name             = 'system/storage/iscsi/iscsi-target'
++      $vncproxy_package_name        = 'cloud/openstack/nova'
++      $spicehtml5proxy_package_name = undef
++      # service names
++      $api_service_name             = 'application/openstack/nova/nova-api-osapi-compute:default'
++      $cells_service_name           = undef
++      $cert_service_name            = 'application/openstack/nova/nova-cert:default'
++      $compute_service_name         = 'application/openstack/nova/nova-compute:default'
++      $conductor_service_name       = 'application/openstack/nova/nova-conductor:default'
++      $consoleauth_service_name     = 'application/openstack/nova/nova-consoleauth:default'
++      $network_service_name         = undef
++      $objectstore_service_name     = 'application/openstack/nova/nova-objectstore:default'
++      $scheduler_service_name       = 'application/openstack/nova/nova-scheduler:default'
++      $tgt_service_name             = 'network/iscsi/target:default'
++      $vncproxy_service_name        = 'application/openstack/nova/nova-novncproxy:default'
++      $spicehtml5proxy_service_name = undef
++    }
+     default: {
+-      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
++      fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily Solaris, RedHat, and Debian")
+     }
+   }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-nova/patches/03-init.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,54 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-nova-6.1.0/manifests/init.pp.orig     2015-08-10 11:07:11.797692743 -0700
++++ openstack-nova-6.1.0/manifests/init.pp     2015-08-10 11:08:05.453328148 -0700
[email protected]@ -397,12 +397,6 @@ class nova(
+   Package['nova-common'] -> Nova_config<| |> -> File['/etc/nova/nova.conf']
+   Nova_config<| |> ~> Exec['post-nova_config']
+
+-  # TODO - see if these packages can be removed
+-  # they should be handled as package deps by the OS
+-  package { 'python-greenlet':
+-    ensure  => present,
+-  }
+-
+   if $install_utilities {
+     class { '::nova::utilities': }
+   }
[email protected]@ -411,23 +405,14 @@ class nova(
+   # allowing a resource to serve as a point where the configuration of nova begins
+   anchor { 'nova-start': }
+
+-  package { 'python-nova':
+-    ensure  => $ensure_package,
+-    require => Package['python-greenlet'],
+-    tag     => ['openstack'],
+-  }
+-
+   package { 'nova-common':
+     ensure  => $ensure_package,
+     name    => $::nova::params::common_package_name,
+-    require => [Package['python-nova'], Anchor['nova-start']],
++    require => Anchor['nova-start'],
+     tag     => ['openstack'],
+   }
+
+   file { '/etc/nova/nova.conf':
+-    mode    => '0640',
+-    owner   => 'nova',
+-    group   => 'nova',
+     require => Package['nova-common'],
+   }
+
[email protected]@ -576,9 +561,6 @@ class nova(
+   if $log_dir {
+     file { $log_dir:
+       ensure  => directory,
+-      mode    => '0750',
+-      owner   => 'nova',
+-      group   => $::nova::params::nova_log_group,
+       require => Package['nova-common'],
+     }
+     nova_config { 'DEFAULT/log_dir': value => $log_dir;}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-nova/patches/04-generic-service.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,15 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-nova-6.1.0/manifests/generic_service.pp.orig	2015-07-07 12:28:25.529079509 -0700
++++ openstack-nova-6.1.0/manifests/generic_service.pp	2015-07-07 12:29:11.890950696 -0700
[email protected]@ -79,7 +79,7 @@ define nova::generic_service(
+       }
+     }
+
+-    service { $nova_title:
++    service { $service_name:
+       ensure    => $service_ensure,
+       name      => $service_name,
+       enable    => $enabled,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-nova/patches/05-api.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,17 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-nova-6.1.0/manifests/api.pp.orig	2015-06-02 16:38:11.660665302 -0600
++++ openstack-nova-6.1.0/manifests/api.pp	2015-06-02 16:39:18.786748191 -0600
[email protected]@ -195,8 +195,8 @@ class nova::api(
+ 
+   Nova_paste_api_ini<| |> ~> Exec['post-nova_config']
+ 
+-  Nova_paste_api_ini<| |> ~> Service['nova-api']
+-  Class['nova::policy'] ~> Service['nova-api']
++  Nova_paste_api_ini<| |> ~> Service[$::nova::params::api_service_name]
++  Class['nova::policy'] ~> Service[$::nova::params::api_service_name]
+ 
+   if $conductor_workers {
+     warning('The conductor_workers parameter is deprecated and has no effect. Use workers parameter of nova::conductor class instead.')
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-nova/patches/06-compute.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,17 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-nova-6.1.0/manifests/compute.pp.orig	2015-06-02 17:00:39.019478510 -0600
++++ openstack-nova-6.1.0/manifests/compute.pp	2015-06-02 17:00:45.549532867 -0600
[email protected]@ -207,10 +207,6 @@ class nova::compute (
+     }
+   }
+ 
+-  package { 'pm-utils':
+-    ensure => present,
+-  }
+-
+   nova_config {
+     'DEFAULT/force_raw_images': value => $force_raw_images;
+   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-openstacklib/Makefile	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		openstack-openstacklib
+COMPONENT_VERSION=	6.1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+    sha256:3e7b777452b577b29a0a75e6c3b7386245b5e551fecd9ed2988402ea8bbbe508
+COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/nova
+
+TPNO=			25379
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/puppetmodule.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+MODULE_NAME =	openstacklib
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-openstacklib/openstack-openstacklib.license	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,191 @@
+Copyright 2012 OpenStack Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+============================================================
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-openstacklib/openstack-openstacklib.p5m	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,94 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/management/puppet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Openstacklib Puppet Module"
+set name=pkg.description \
+    value="The openstacklib module is a library module for other Openstack modules to utilize."
+set name=com.oracle.info.description value="Openstacklib Puppet Module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=info.upstream value="OpenStack <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=etc/puppet/modules/openstacklib/CHANGELOG.md
+file path=etc/puppet/modules/openstacklib/Gemfile
+file path=etc/puppet/modules/openstacklib/LICENSE
+file path=etc/puppet/modules/openstacklib/README.md
+file path=etc/puppet/modules/openstacklib/Rakefile
+file path=etc/puppet/modules/openstacklib/checksums.json
+file path=etc/puppet/modules/openstacklib/lib/puppet/parser/functions/os_database_connection.rb
+file path=etc/puppet/modules/openstacklib/lib/puppet/provider/openstack.rb
+file path=etc/puppet/modules/openstacklib/lib/puppet/provider/openstack/auth.rb
+file path=etc/puppet/modules/openstacklib/lib/puppet/provider/openstack/credentials.rb
+file path=etc/puppet/modules/openstacklib/manifests/db/mysql.pp
+file path=etc/puppet/modules/openstacklib/manifests/db/mysql/host_access.pp
+file path=etc/puppet/modules/openstacklib/manifests/db/postgresql.pp
+file path=etc/puppet/modules/openstacklib/manifests/messaging/rabbitmq.pp
+file path=etc/puppet/modules/openstacklib/manifests/openstackclient.pp
+file path=etc/puppet/modules/openstacklib/manifests/policy.pp
+file path=etc/puppet/modules/openstacklib/manifests/policy/base.pp
+file path=etc/puppet/modules/openstacklib/manifests/service_validation.pp
+file path=etc/puppet/modules/openstacklib/manifests/wsgi/apache.pp
+file path=etc/puppet/modules/openstacklib/metadata.json
+file path=etc/puppet/modules/openstacklib/spec/acceptance/mysql_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/acceptance/nodesets/default.yml
+file path=etc/puppet/modules/openstacklib/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=etc/puppet/modules/openstacklib/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/openstacklib/spec/acceptance/rabbitmq_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/classes/init_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/classes/openstacklib_policy_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_db_mysql_host_access_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_db_mysql_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_db_postgresql_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_messaging_rabbitmq_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_policy_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_service_validation_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/defines/openstacklib_wsgi_apache_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/functions/os_database_connection_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/shared_examples.rb
+file path=etc/puppet/modules/openstacklib/spec/spec_helper.rb
+file path=etc/puppet/modules/openstacklib/spec/spec_helper_acceptance.rb
+file path=etc/puppet/modules/openstacklib/spec/unit/provider/openstack/auth_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/unit/provider/openstack/credentials_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/unit/provider/openstack_spec.rb
+#
+license openstack-openstacklib.license license="Apache v2.0"
+
+# for a dependency on python/openstackclient
+depend type=require fmri=library/python/openstackclient
+
+# force a dependency on puppetlabs-mysql
+depend type=require fmri=system/management/puppet/puppetlabs-mysql
+
+# force a dependency on puppetlabs-rabbitmq
+depend type=require fmri=system/management/puppet/puppetlabs-rabbitmq
+
+# force a dependency on puppetlabs-stdlib
+depend type=require fmri=system/management/puppet/puppetlabs-stdlib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-openstacklib/patches/01-metadata.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,30 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-openstacklib-6.1.0/metadata.json.orig   2015-10-15 09:31:01.371175733 -0700
++++ openstack-openstacklib-6.1.0/metadata.json       2015-10-15 09:31:40.878053925 -0700
[email protected]@ -11,8 +11,7 @@
+     {"name":"puppetlabs/apache","version_requirement":">=1.0.0 <2.0.0"},
+     {"name":"puppetlabs/mysql","version_requirement":">=3.0.0 <4.0.0"},
+     {"name":"puppetlabs/stdlib","version_requirement":">=4.0.0 <5.0.0"},
+-    {"name":"puppetlabs/rabbitmq","version_requirement":">=2.0.2 <6.0.0"},
+-    {"name":"puppetlabs/postgresql","version_requirement":">=3.3.0 <4.0.0"}
++    {"name":"puppetlabs/rabbitmq","version_requirement":">=2.0.2 <6.0.0"}
+   ],
+   "requirements": [
+     {
[email protected]@ -50,6 +49,13 @@
+         "12.04",
+         "14.04"
+       ]
++    },
++    {
++      "operatingsystem": "Solaris",
++      "operatingsystemrelease": [
++        "11.3",
++        "12.0"
++      ]
+     }
+   ],
+   "description": "Puppet module library to expose common functionality between OpenStack modules."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-openstacklib/patches/02-openstackclient.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,27 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-openstacklib-6.1.0/manifests/openstackclient.pp.orig	2015-06-05 16:06:39.223700269 -0600
++++ openstack-openstacklib-6.1.0/manifests/openstackclient.pp	2015-06-05 16:08:35.218161669 -0600
[email protected]@ -10,9 +10,16 @@
+ #
+ class openstacklib::openstackclient(
+   $package_ensure = 'present',
+-){
+-  package { 'python-openstackclient':
+-    ensure => $package_ensure,
+-    tag    => 'openstack',
++) {
++  if $::osfamily == 'Solaris' {
++    package { 'library/python/openstackclient':
++      ensure => $package_ensure,
++      tag    => 'openstack',
++    }
++  } else {
++    package { 'python-openstackclient':
++      ensure => $package_ensure,
++      tag    => 'openstack',
++    }
+   }
+ }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-swift/Makefile	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		openstack-swift
+COMPONENT_VERSION=	6.1.0
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH= \
+    sha256:f55632ddfc4a367a7c161af926b505595c5046344cabaf156d14407185831290
+COMPONENT_ARCHIVE_URL=	http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=	http://www.openstack.org/
+COMPONENT_BUGDB=	service/swift
+
+TPNO=			25378
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/puppetmodule.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+MODULE_NAME =	swift
+
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
+# common targets
+build:		$(BUILD_NO_ARCH)
+
+install:	$(INSTALL_NO_ARCH)
+
+test:		$(NO_TESTS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-swift/openstack-swift.license	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,191 @@
+Copyright 2012 OpenStack Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+============================================================
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by
+the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under common
+control with that entity. For the purposes of this definition,
+"control" means (i) the power, direct or indirect, to cause the
+direction or management of such entity, whether by contract or
+otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the purposes
+of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of,
+the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or additions
+to that Work or Derivative Works thereof, that is intentionally
+submitted to Licensor for inclusion in the Work by the copyright owner
+or by an individual or Legal Entity authorized to submit on behalf of
+the copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems,
+and issue tracking systems that are managed by, or on behalf of, the
+Licensor for the purpose of discussing and improving the Work, but
+excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the
+Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made,
+use, offer to sell, sell, import, and otherwise transfer the Work,
+where such license applies only to those patent claims licensable
+by such Contributor that are necessarily infringed by their
+Contribution(s) alone or by combination of their Contribution(s)
+with the Work to which such Contribution(s) was submitted. If You
+institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work
+or a Contribution incorporated within the Work constitutes direct
+or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+Work or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You
+meet the following conditions:
+
+(a) You must give any other recipients of the Work or
+Derivative Works a copy of this License; and
+
+(b) You must cause any modified files to carry prominent notices
+stating that You changed the files; and
+
+(c) You must retain, in the Source form of any Derivative Works
+that You distribute, all copyright, patent, trademark, and
+attribution notices from the Source form of the Work,
+excluding those notices that do not pertain to any part of
+the Derivative Works; and
+
+(d) If the Work includes a "NOTICE" text file as part of its
+distribution, then any Derivative Works that You distribute must
+include a readable copy of the attribution notices contained
+within such NOTICE file, excluding those notices that do not
+pertain to any part of the Derivative Works, in at least one
+of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or
+documentation, if provided along with the Derivative Works; or,
+within a display generated by the Derivative Works, if and
+wherever such third-party notices normally appear. The contents
+of the NOTICE file are for informational purposes only and
+do not modify the License. You may add Your own attribution
+notices within Derivative Works that You distribute, alongside
+or as an addendum to the NOTICE text from the Work, provided
+that such additional attribution notices cannot be construed
+as modifying the License.
+
+You may add Your own copyright statement to Your modifications and
+may provide additional or different license terms and conditions
+for use, reproduction, or distribution of Your modifications, or
+for any such Derivative Works as a whole, provided Your use,
+reproduction, and distribution of the Work otherwise complies with
+the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work
+by You to the Licensor shall be under the terms and conditions of
+this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify
+the terms of any separate license agreement you may have executed
+with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or conditions
+of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+PARTICULAR PURPOSE. You are solely responsible for determining the
+appropriateness of using or redistributing the Work and assume any
+risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise,
+unless required by applicable law (such as deliberate and grossly
+negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a
+result of this License or out of the use or inability to use the
+Work (including but not limited to damages for loss of goodwill,
+work stoppage, computer failure or malfunction, or any and all
+other commercial damages or losses), even if such Contributor
+has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer,
+and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only
+on Your own behalf and on Your sole responsibility, not on behalf
+of any other Contributor, and only if You agree to indemnify,
+defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason
+of your accepting any such warranty or additional liability.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-swift/openstack-swift.p5m	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,235 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/system/management/puppet/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="OpenStack Swift Puppet Module"
+set name=pkg.description \
+    value="The swift module is a thorough attempt to make Puppet capable of managing the entirety of swift.  This includes manifests to provision such things as keystone, stroage backends, proxies, and the ring.  Types are shipped as part of the swift module to assist in manipulation of configuration files.  The classes in this module will deploy Swift using best practices for a typical deployment."
+set name=com.oracle.info.description value="Swift Puppet Module"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration" \
+    value="org.opensolaris.category.2008:System/Enterprise Management"
+set name=info.upstream value="OpenStack <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/001
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=etc/puppet/modules/swift/CHANGELOG.md
+file path=etc/puppet/modules/swift/Gemfile
+file path=etc/puppet/modules/swift/LICENSE
+file path=etc/puppet/modules/swift/README.md
+file path=etc/puppet/modules/swift/Rakefile
+file path=etc/puppet/modules/swift/checksums.json
+file path=etc/puppet/modules/swift/ext/swift.rb
+file path=etc/puppet/modules/swift/ext/swift_keystone_test.rb
+file path=etc/puppet/modules/swift/files/swift-account.conf.upstart
+file path=etc/puppet/modules/swift/files/swift-container-sync.conf.upstart
+file path=etc/puppet/modules/swift/files/swift-container.conf.upstart
+file path=etc/puppet/modules/swift/files/swift-object.conf.upstart
+file path=etc/puppet/modules/swift/files/swift_tester.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/ring_account_device/swift_ring_builder.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/ring_container_device/swift_ring_builder.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/ring_object_device/swift_ring_builder.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/swift_account_config/ini_setting.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/swift_bench_config/ini_setting.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/swift_config/ini_setting.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/swift_container_config/ini_setting.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/swift_dispersion_config/ini_setting.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/swift_object_config/ini_setting.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/swift_proxy_config/ini_setting.rb
+file path=etc/puppet/modules/swift/lib/puppet/provider/swift_ring_builder.rb
+file path=etc/puppet/modules/swift/lib/puppet/type/ring_account_device.rb
+file path=etc/puppet/modules/swift/lib/puppet/type/ring_container_device.rb
+file path=etc/puppet/modules/swift/lib/puppet/type/ring_object_device.rb
+file path=etc/puppet/modules/swift/lib/puppet/type/swift_account_config.rb
+file path=etc/puppet/modules/swift/lib/puppet/type/swift_bench_config.rb
+file path=etc/puppet/modules/swift/lib/puppet/type/swift_config.rb
+file path=etc/puppet/modules/swift/lib/puppet/type/swift_container_config.rb
+file path=etc/puppet/modules/swift/lib/puppet/type/swift_dispersion_config.rb
+file path=etc/puppet/modules/swift/lib/puppet/type/swift_object_config.rb
+file path=etc/puppet/modules/swift/lib/puppet/type/swift_proxy_config.rb
+file path=etc/puppet/modules/swift/manifests/auth_file.pp
+file path=etc/puppet/modules/swift/manifests/bench.pp
+file path=etc/puppet/modules/swift/manifests/client.pp
+file path=etc/puppet/modules/swift/manifests/dispersion.pp
+file path=etc/puppet/modules/swift/manifests/init.pp
+file path=etc/puppet/modules/swift/manifests/keystone/auth.pp
+file path=etc/puppet/modules/swift/manifests/keystone/dispersion.pp
+file path=etc/puppet/modules/swift/manifests/params.pp
+file path=etc/puppet/modules/swift/manifests/proxy.pp
+file path=etc/puppet/modules/swift/manifests/proxy/account_quotas.pp
+file path=etc/puppet/modules/swift/manifests/proxy/authtoken.pp
+file path=etc/puppet/modules/swift/manifests/proxy/bulk.pp
+file path=etc/puppet/modules/swift/manifests/proxy/cache.pp
+file path=etc/puppet/modules/swift/manifests/proxy/catch_errors.pp
+file path=etc/puppet/modules/swift/manifests/proxy/ceilometer.pp
+file path=etc/puppet/modules/swift/manifests/proxy/container_quotas.pp
+file path=etc/puppet/modules/swift/manifests/proxy/crossdomain.pp
+file path=etc/puppet/modules/swift/manifests/proxy/formpost.pp
+file path=etc/puppet/modules/swift/manifests/proxy/gatekeeper.pp
+file path=etc/puppet/modules/swift/manifests/proxy/healthcheck.pp
+file path=etc/puppet/modules/swift/manifests/proxy/keystone.pp
+file path=etc/puppet/modules/swift/manifests/proxy/proxy_logging.pp
+file path=etc/puppet/modules/swift/manifests/proxy/ratelimit.pp
+file path=etc/puppet/modules/swift/manifests/proxy/s3token.pp
+file path=etc/puppet/modules/swift/manifests/proxy/slo.pp
+file path=etc/puppet/modules/swift/manifests/proxy/staticweb.pp
+file path=etc/puppet/modules/swift/manifests/proxy/swauth.pp
+file path=etc/puppet/modules/swift/manifests/proxy/swift3.pp
+file path=etc/puppet/modules/swift/manifests/proxy/tempauth.pp
+file path=etc/puppet/modules/swift/manifests/proxy/tempurl.pp
+file path=etc/puppet/modules/swift/manifests/ringbuilder.pp
+file path=etc/puppet/modules/swift/manifests/ringbuilder/create.pp
+file path=etc/puppet/modules/swift/manifests/ringbuilder/rebalance.pp
+file path=etc/puppet/modules/swift/manifests/ringserver.pp
+file path=etc/puppet/modules/swift/manifests/ringsync.pp
+file path=etc/puppet/modules/swift/manifests/storage.pp
+file path=etc/puppet/modules/swift/manifests/storage/account.pp
+file path=etc/puppet/modules/swift/manifests/storage/all.pp
+file path=etc/puppet/modules/swift/manifests/storage/container.pp
+file path=etc/puppet/modules/swift/manifests/storage/disk.pp
+file path=etc/puppet/modules/swift/manifests/storage/ext4.pp
+file path=etc/puppet/modules/swift/manifests/storage/filter/healthcheck.pp
+file path=etc/puppet/modules/swift/manifests/storage/filter/recon.pp
+file path=etc/puppet/modules/swift/manifests/storage/generic.pp
+file path=etc/puppet/modules/swift/manifests/storage/loopback.pp
+file path=etc/puppet/modules/swift/manifests/storage/mount.pp
+file path=etc/puppet/modules/swift/manifests/storage/node.pp
+file path=etc/puppet/modules/swift/manifests/storage/object.pp
+file path=etc/puppet/modules/swift/manifests/storage/server.pp
+file path=etc/puppet/modules/swift/manifests/storage/xfs.pp
+file path=etc/puppet/modules/swift/manifests/test_file.pp
+file path=etc/puppet/modules/swift/manifests/xfs.pp
+file path=etc/puppet/modules/swift/metadata.json
+file path=etc/puppet/modules/swift/spec/acceptance/basic_swift_spec.rb
+file path=etc/puppet/modules/swift/spec/acceptance/nodesets/default.yml
+file path=etc/puppet/modules/swift/spec/acceptance/nodesets/nodepool-centos7.yml
+file path=etc/puppet/modules/swift/spec/acceptance/nodesets/nodepool-trusty.yml
+file path=etc/puppet/modules/swift/spec/classes/swift_bench_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_client_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_dispersion_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_keystone_auth_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_keystone_dispersion_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_account_quotas_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_authtoken_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_bulk_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_cache_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_catch_errors_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_ceilometer_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_container_quotas_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_crossdomain_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_formpost_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_gatekeeper_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_healthcheck_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_keystone_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_ratelimit_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_s3token_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_slo_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_staticweb_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_swauth_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_swift3_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_proxy_tempurl_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_ringbuilder_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_ringserver_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_storage_account_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_storage_all_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_storage_container_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_storage_object_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_storage_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_test_file_spec.rb
+file path=etc/puppet/modules/swift/spec/classes/swift_xfs_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_ringbuilder_create_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_ringbuilder_rebalance_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_storage_disk_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_storage_filter_healthcheck_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_storage_filter_recon_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_storage_generic_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_storage_loopback_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_storage_mount_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_storage_node_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_storage_server_spec.rb
+file path=etc/puppet/modules/swift/spec/defines/swift_storage_xfs_spec.rb
+file path=etc/puppet/modules/swift/spec/shared_examples.rb
+file path=etc/puppet/modules/swift/spec/spec.opts
+file path=etc/puppet/modules/swift/spec/spec_helper.rb
+file path=etc/puppet/modules/swift/spec/spec_helper_acceptance.rb
+file path=etc/puppet/modules/swift/spec/unit/puppet/provider/swift_ring_builder_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/puppet/type/ring_account_device_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/puppet/type/ring_container_device_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/puppet/type/ring_object_device_spec.rb
+file path=etc/puppet/modules/swift/templates/account-server.conf.erb
+file path=etc/puppet/modules/swift/templates/container-server.conf.erb
+file path=etc/puppet/modules/swift/templates/object-server.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy-server.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/account_quotas.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/authtoken.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/bulk.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/cache.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/catch_errors.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/ceilometer.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/container_quotas.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/crossdomain.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/formpost.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/gatekeeper.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/healthcheck.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/keystone.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/proxy-logging.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/ratelimit.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/s3token.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/slo.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/staticweb.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/swauth.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/swift3.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/tempauth.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/tempurl.conf.erb
+file path=etc/puppet/modules/swift/templates/recon.conf.erb
+file path=etc/puppet/modules/swift/templates/rsyncd.conf.erb
+file path=etc/puppet/modules/swift/templates/swift_keystone_test.erb
+file path=etc/puppet/modules/swift/tests/all.pp
+file path=etc/puppet/modules/swift/tests/site.pp
+#
+license openstack-swift.license license="Apache v2.0"
+
+# force a dependency on openstack-keystone
+depend type=require fmri=system/management/puppet/openstack-keystone
+
+# force a dependency on puppetlabs-concat
+depend type=require fmri=system/management/puppet/puppetlabs-concat
+
+# force a dependency on puppetlabs-inifile
+depend type=require fmri=system/management/puppet/puppetlabs-inifile
+
+# force a dependency on puppetlabs-rsync
+depend type=require fmri=system/management/puppet/puppetlabs-rsync
+
+# force a dependency on puppetlabs-stdlib
+depend type=require fmri=system/management/puppet/puppetlabs-stdlib
+
+# force a dependency on saz-memcached
+depend type=require fmri=system/management/puppet/saz-memcached
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-swift/patches/01-metadata.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,28 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-swift-6.1.0/metadata.json.orig   2015-10-15 09:34:46.063071510 -0700
++++ openstack-swift-6.1.0/metadata.json       2015-10-15 09:34:54.213840811 -0700
[email protected]@ -12,7 +12,6 @@
+     {"name":"openstack/keystone","version_requirement":">=6.0.0 <7.0.0"},
+     {"name":"puppetlabs/rsync","version_requirement":">=0.2.0 <1.0.0"},
+     {"name":"puppetlabs/stdlib","version_requirement":">=4.0.0 <5.0.0"},
+-    {"name":"puppetlabs/xinetd","version_requirement":">=1.0.1 <2.0.0"},
+     {"name":"puppetlabs/concat","version_requirement":">=1.0.0 <2.0.0"},
+     {"name":"saz/memcached","version_requirement":">=2.0.2 <3.0.0"}
+   ],
[email protected]@ -52,6 +51,13 @@
+         "12.04",
+         "14.04"
+       ]
++    },
++    {
++      "operatingsystem": "Solaris",
++      "operatingsystemrelease": [
++        "11.3",
++        "12.0"
++      ]
+     }
+   ],
+   "description": "Installs and configures OpenStack Swift (Object Storage)."
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-swift/patches/02-params.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,36 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-swift-6.1.0/manifests/params.pp.orig	2015-05-29 11:36:03.646990312 -0600
++++ openstack-swift-6.1.0/manifests/params.pp	2015-05-29 11:36:37.616190956 -0600
[email protected]@ -52,6 +52,29 @@ class swift::params {
+       $service_provider                  = undef
+       $swift3                            = 'openstack-swift-plugin-swift3'
+     }
++    'Solaris': {
++      $package_name                      = 'cloud/openstack/swift'
++      $client_package                    = 'library/python/swiftclient'
++      $proxy_package_name                = 'cloud/openstack/swift'
++      $proxy_service_name                = 'application/openstack/swift/swift-proxy-server:default'
++      $object_package_name               = 'cloud/openstack/swift'
++      $object_service_name               = 'application/openstack/swift/swift-object-server:default'
++      $object_auditor_service_name       = 'application/openstack/swift/swift-object-auditor:default'
++      $object_replicator_service_name    = 'application/openstack/swift/swift-object-replicator:default'
++      $object_updater_service_name       = 'application/openstack/swift/swift-object-updater:default'
++      $container_package_name            = 'cloud/openstack/swift'
++      $container_service_name            = 'application/openstack/swift/swift-container-server:default'
++      $container_auditor_service_name    = 'application/openstack/swift/swift-container-auditor:default'
++      $container_replicator_service_name = 'application/openstack/swift/swift-container-replicator:default'
++      $container_updater_service_name    = 'application/openstack/swift/swift-container-updater:default'
++      $account_package_name              = 'cloud/openstack/swift'
++      $account_service_name              = 'application/openstack/swift/swift-account-server:default'
++      $account_auditor_service_name      = 'application/openstack/swift/swift-account-auditor:default'
++      $account_reaper_service_name       = 'application/openstack/swift/swift-account-reaper:default'
++      $account_replicator_service_name   = 'application/openstack/swift/swift-account-replicator:default'
++      $service_provider                  = 'smf'
++      $swift3                            = undef
++    }
+     default: {
+         fail("Unsupported osfamily: ${::osfamily} for os ${::operatingsystem}")
+     }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-swift/patches/03-init.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,55 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-swift-6.1.0/manifests/init.pp.orig     2015-08-10 11:12:30.293187329 -0700
++++ openstack-swift-6.1.0/manifests/init.pp     2015-08-10 11:13:32.086133292 -0700
[email protected]@ -2,6 +2,10 @@
+ #
+ # == Parameters
+ #
++# [*swift_hash_prefix*] string of text to be used
++#   as a salt when hashing to determine mappings in the ring.
++#   This file should be the same on every node in the cluster.
++#
+ # [*swift_hash_suffix*] string of text to be used
+ #   as a salt when hashing to determine mappings in the ring.
+ #   This file should be the same on every node in the cluster.
[email protected]@ -29,6 +33,7 @@
+ # Copyright 2011 Puppetlabs Inc, unless otherwise noted.
+ #
+ class swift(
++  $swift_hash_prefix,
+   $swift_hash_suffix,
+   $package_ensure        = 'present',
+   $client_package_ensure = 'present',
[email protected]@ -49,27 +54,9 @@ class swift(
+     ensure => $client_package_ensure;
+   }
+
+-  File { owner => 'swift', group => 'swift', require => Package['swift'] }
+-
+-  file { '/etc/swift':
+-    ensure => directory,
+-    mode   => '2770',
+-  }
+-  user {'swift':
+-    ensure => present,
+-  }
+-  file { '/var/lib/swift':
+-    ensure => directory,
+-  }
+-  file { '/var/run/swift':
+-    ensure => directory,
+-  }
+-
+-  file { '/etc/swift/swift.conf':
+-    ensure => file,
+-    mode   => '0660',
++  swift_config { 'swift-hash/swift_hash_path_prefix':
++    value => $swift_hash_prefix,
+   }
+-
+   swift_config { 'swift-hash/swift_hash_path_suffix':
+     value => $swift_hash_suffix,
+   }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,32 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-swift-6.1.0/manifests/proxy.pp.orig	2015-09-14 13:10:38.379095262 +0100
++++ openstack-swift-6.1.0/manifests/proxy.pp	2015-09-14 13:11:32.939063467 +0100
[email protected]@ -167,17 +167,20 @@
+     fail ('log_udp_port requires log_udp_host to be set')
+   }
+ 
+-  package { 'swift-proxy':
+-    ensure => $package_ensure,
+-    name   => $::swift::params::proxy_package_name,
+-    tag    => 'openstack',
++  if ( $swift::params::proxy_package_name != $swift::params::package_name ) {
++    ensure_packages([$swift::params::proxy_package_name],
++      {
++        ensure => $package_ensure,
++        name   => $::swift::params::proxy_package_name,
++        tag    => 'openstack',
++      }
++    )
+   }
+ 
+   concat { '/etc/swift/proxy-server.conf':
+     owner   => 'swift',
+     group   => 'swift',
+     mode    => '0660',
+-    require => Package['swift-proxy'],
+   }
+ 
+   $required_classes = split(
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,69 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-swift-6.1.0/manifests/ringserver.pp.orig 2015-10-15 08:03:54.000000000 -0700
++++ openstack-swift-6.1.0/manifests/ringserver.pp       2015-11-02 09:49:22.778783205 -0800
[email protected]@ -32,20 +32,9 @@ class swift::ringserver(
+
+   Class['swift::ringbuilder'] -> Class['swift::ringserver']
+
+-  if !defined(Class['rsync::server']) {
+-    class { '::rsync::server':
+-      use_xinetd => true,
+-      address    => $local_net_ip,
+-      use_chroot => 'no',
++  if !defined(Service['application/openstack/swift/swift-replicator-rsync']) {
++    service { 'application/openstack/swift/swift-replicator-rsync':
++      ensure   => 'running',
+     }
+   }
+-
+-  rsync::server::module { 'swift_server':
+-    path            => '/etc/swift',
+-    lock_file       => '/var/lock/swift_server.lock',
+-    uid             => 'swift',
+-    gid             => 'swift',
+-    max_connections => $max_connections,
+-    read_only       => true,
+-  }
+ }
+
+--- openstack-swift-6.1.0/manifests/storage.pp.orig    2015-10-15 08:03:54.000000000 -0700
++++ openstack-swift-6.1.0/manifests/storage.pp  2015-11-02 09:46:53.798720245 -0800
[email protected]@ -23,11 +23,9 @@ class swift::storage(
+   $storage_local_net_ip
+ ) {
+
+-  if !defined(Class['rsync::server']){
+-    class{ '::rsync::server':
+-      use_xinetd => true,
+-      address    => $storage_local_net_ip,
+-      use_chroot => 'no',
++  if !defined(Service['application/openstack/swift/swift-replicator-rsync']) {
++    service { 'application/openstack/swift/swift-replicator-rsync':
++      ensure   => 'running',
+     }
+   }
+ }
+
+--- openstack-swift-6.1.0/manifests/storage/server.pp.orig       2015-11-02 09:51:04.785489361 -0800
++++ openstack-swift-6.1.0/manifests/storage/server.pp   2015-11-02 09:51:16.912645480 -0800
[email protected]@ -165,17 +165,6 @@ define swift::storage::server(
+
+   $bind_port = $name
+
+-  rsync::server::module { $type:
+-    path            => $devices,
+-    lock_file       => "/var/lock/${type}.lock",
+-    uid             => $owner,
+-    gid             => $group,
+-    incoming_chmod  => $incoming_chmod,
+-    outgoing_chmod  => $outgoing_chmod,
+-    max_connections => $max_connections,
+-    read_only       => false,
+-  }
+-
+   concat { "/etc/swift/${config_file_path}":
+     owner   => $owner,
+     group   => $group,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-swift/patches/06-storage.patch	Tue Feb 16 13:47:43 2016 -0800
@@ -0,0 +1,96 @@
+In-house patch to add support for Solaris 11.3 and 12.0.  This patch
+has not yet been submitted upstream due to requirements for 3rd party
+CI testing.
+
+--- openstack-swift-6.1.0/manifests/storage/account.pp.orig	2015-11-01 07:14:14.938361224 -0800
++++ openstack-swift-6.1.0/manifests/storage/account.pp	2015-11-01 07:14:28.358271152 -0800
[email protected]@ -43,7 +43,6 @@ class swift::storage::account(
+     name     => $::swift::params::account_reaper_service_name,
+     enable   => $enabled,
+     provider => $::swift::params::service_provider,
+-    require  => Package['swift-account'],
+   }
+ 
+   service { 'swift-account-auditor':
[email protected]@ -51,6 +50,5 @@ class swift::storage::account(
+     name     => $::swift::params::account_auditor_service_name,
+     enable   => $enabled,
+     provider => $::swift::params::service_provider,
+-    require  => Package['swift-account'],
+   }
+ }
+--- openstack-swift-6.1.0/manifests/storage/container.pp.orig	2015-11-01 07:15:34.539750559 -0800
++++ openstack-swift-6.1.0/manifests/storage/container.pp	2015-11-01 07:15:55.927391806 -0800
[email protected]@ -48,7 +48,6 @@ class swift::storage::container(
+     name     => $::swift::params::container_updater_service_name,
+     enable   => $enabled,
+     provider => $::swift::params::service_provider,
+-    require  => Package['swift-container'],
+   }
+ 
+   service { 'swift-container-auditor':
[email protected]@ -56,7 +55,6 @@ class swift::storage::container(
+     name     => $::swift::params::container_auditor_service_name,
+     enable   => $enabled,
+     provider => $::swift::params::service_provider,
+-    require  => Package['swift-container'],
+   }
+ 
+   if $::operatingsystem == 'Ubuntu' {
+--- openstack-swift-6.1.0/manifests/storage/object.pp.orig	2015-11-01 07:16:23.265853901 -0800
++++ openstack-swift-6.1.0/manifests/storage/object.pp	2015-11-01 07:16:37.685187620 -0800
[email protected]@ -43,7 +43,6 @@ class swift::storage::object(
+     name     => $::swift::params::object_updater_service_name,
+     enable   => $enabled,
+     provider => $::swift::params::service_provider,
+-    require  => Package['swift-object'],
+   }
+ 
+   service { 'swift-object-auditor':
[email protected]@ -51,6 +50,5 @@ class swift::storage::object(
+     name     => $::swift::params::object_auditor_service_name,
+     enable   => $enabled,
+     provider => $::swift::params::service_provider,
+-    require  => Package['swift-object'],
+   }
+ }
+--- openstack-swift-6.1.0/manifests/storage/generic.pp.orig	2015-11-01 07:17:15.132929299 -0800
++++ openstack-swift-6.1.0/manifests/storage/generic.pp	2015-11-01 07:17:33.210237904 -0800
[email protected]@ -42,21 +42,6 @@ define swift::storage::generic(
+ 
+   validate_re($name, '^object|container|account$')
+ 
+-  package { "swift-${name}":
+-    ensure => $package_ensure,
+-    # this is a way to dynamically build the variables to lookup
+-    # sorry its so ugly :(
+-    name   => inline_template("<%= scope.lookupvar('::swift::params::${name}_package_name') %>"),
+-    tag    => 'openstack',
+-    before => Service["swift-${name}", "swift-${name}-replicator"],
+-  }
+-
+-  file { "/etc/swift/${name}-server/":
+-    ensure => directory,
+-    owner  => 'swift',
+-    group  => 'swift',
+-  }
+-
+   if $manage_service {
+     if $enabled {
+       $service_ensure = 'running'
[email protected]@ -71,7 +56,6 @@ define swift::storage::generic(
+     enable    => $enabled,
+     hasstatus => true,
+     provider  => $service_provider,
+-    subscribe => Package["swift-${name}"],
+   }
+ 
+   service { "swift-${name}-replicator":
[email protected]@ -80,7 +64,6 @@ define swift::storage::generic(
+     enable    => $enabled,
+     hasstatus => true,
+     provider  => $service_provider,
+-    subscribe => Package["swift-${name}"],
+   }
+ 
+ }