--- a/components/ruby/puppet-modules/openstack-cinder/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-cinder/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-cinder
-COMPONENT_VERSION= 6.1.0
+COMPONENT_VERSION= 8.2.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_ARCHIVE_HASH= \
+ sha256:d2147e542c00a1242cb58e18dabb1bcadbee92885db306bf0f48dd92081ca12c
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-cinder/puppet-cinder-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/cinder
-TPNO= 25356
+TPNO= 30874
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/openstack-cinder/openstack-cinder.p5m Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-cinder/openstack-cinder.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -45,20 +45,26 @@
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.rb
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/provider/cinder_type/openstack.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/lib/puppet/type/cinder_type.rb
file path=etc/puppet/modules/cinder/manifests/api.pp
+file path=etc/puppet/modules/cinder/manifests/backend/bdd.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/gpfs.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/pure.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
@@ -83,6 +89,7 @@
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.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
@@ -94,6 +101,7 @@
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/quota_set.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
@@ -106,11 +114,13 @@
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/gpfs.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/pure.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
@@ -127,10 +137,35 @@
file files/volume/zfssa_iscsi.pp \
path=etc/puppet/modules/cinder/manifests/volume/zfssa_iscsi.pp
file path=etc/puppet/modules/cinder/metadata.json
+file path=etc/puppet/modules/cinder/releasenotes/notes/Test-volume-permissions-7ca9964fdb8491a2.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/block_device_backend-877dc1cd0ffab684.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/cinder_v3-aacaa1f385aab7c4.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/deprecate_auth_params-e34ba5123cee9060.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/deprecate_cluster_id-8d9838a9ef8932bf.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/deprecate_liberty-192d873c0d039e21.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/emc_vnx_driver-359208e3eeeaabf7.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/fix_multiple_rbd-e70b48e788387fa8.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/host_config-d58e1bb4c2aff303.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/keystone-v3-support-cinder_type-09357cfcf7834e80.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/solidfire_glance-e3bc65c5ff6a634d.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/type_providers-4f316d6b119c4d38.yaml
+file path=etc/puppet/modules/cinder/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/cinder/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/cinder/releasenotes/source/conf.py
+file path=etc/puppet/modules/cinder/releasenotes/source/index.rst
+file path=etc/puppet/modules/cinder/releasenotes/source/mitaka.rst
+file path=etc/puppet/modules/cinder/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/cinder/setup.cfg
+file path=etc/puppet/modules/cinder/setup.py
file path=etc/puppet/modules/cinder/spec/acceptance/basic_cinder_spec.rb
+file path=etc/puppet/modules/cinder/spec/acceptance/nodesets/centos-70-x64.yml
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/acceptance/nodesets/ubuntu-server-1404-x64.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
@@ -142,13 +177,13 @@
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_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
@@ -160,36 +195,51 @@
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_gpfs_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_pure_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_bdd_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_gpfs_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_pure_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_quota_set_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
+file path=etc/puppet/modules/cinder/spec/unit/provider/cinder_api_paste_ini/ini_setting_spec.rb
+file path=etc/puppet/modules/cinder/spec/unit/provider/cinder_config/ini_setting_spec.rb
+file path=etc/puppet/modules/cinder/spec/unit/provider/cinder_spec.rb
+file path=etc/puppet/modules/cinder/spec/unit/provider/cinder_type/openstack_spec.rb
+file path=etc/puppet/modules/cinder/spec/unit/type/cinder_api_paste_spec.rb
+file path=etc/puppet/modules/cinder/spec/unit/type/cinder_config_spec.rb
+file path=etc/puppet/modules/cinder/spec/unit/type/cinder_type_spec.rb
+file path=etc/puppet/modules/cinder/test-requirements.txt
+file path=etc/puppet/modules/cinder/tox.ini
#
license openstack-cinder.license license="Apache v2.0"
--- a/components/ruby/puppet-modules/openstack-cinder/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-cinder/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,36 +2,20 @@
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
-@@ -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"},
-@@ -51,6 +50,13 @@
- "12.04",
+--- openstack-cinder-8.2.0/metadata.json.orig 2016-08-07 10:35:15.496225800 -0700
++++ openstack-cinder-8.2.0/metadata.json 2016-08-07 10:35:48.801320370 -0700
+@@ -29,6 +29,13 @@
+ "operatingsystemrelease": [
"14.04"
]
+ },
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
}
],
- "description": "Installs and configures OpenStack Cinder (Block Storage)."
+ "description": "Installs and configures OpenStack Cinder (Block Storage).",
---- openstack-cinder-6.1.0/README.md.orig 2016-04-27 11:17:12.024829187 -0700
-+++ openstack-cinder-6.1.0/README.md 2016-04-27 11:22:18.054347137 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- cinder
- =======
-
--- a/components/ruby/puppet-modules/openstack-cinder/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-cinder/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,8 +2,8 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-cinder-6.1.0/manifests/params.pp.orig 2016-04-21 07:42:54.508653869 -0700
-+++ openstack-cinder-6.1.0/manifests/params.pp 2016-04-21 07:43:26.330669185 -0700
+--- openstack-cinder-8.0.1/manifests/params.pp.orig 2015-10-15 09:42:47.576607396 -0600
++++ openstack-cinder-8.0.1/manifests/params.pp 2015-10-15 09:43:48.776845153 -0600
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
@@ -12,11 +12,12 @@
# == Class: cinder::params
#
class cinder::params {
-@@ -51,7 +55,24 @@
+@@ -57,7 +57,26 @@ class cinder::params {
}
}
+ } elsif($::osfamily == 'Solaris') {
++
+ $package_name = 'cloud/openstack/cinder'
+ $client_package = 'library/python/cinderclient'
+ $api_package = undef
@@ -33,8 +34,9 @@
+ $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")
++ fail("unsupported osfamily ${::osfamily}, currently Debian, Redhat, and Solaris are the only supported platforms")
}
}
--- a/components/ruby/puppet-modules/openstack-cinder/patches/03-grep.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-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 2016-04-21 07:44:39.304234219 -0700
-+++ openstack-cinder-6.1.0/spec/defines/cinder_type_set_spec.rb 2016-04-21 07:45:54.080994658 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- #Author: Andrew Woodward <[email protected]>
-
- require 'spec_helper'
-@@ -19,7 +23,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 2016-04-21 07:44:43.458867297 -0700
-+++ openstack-cinder-6.1.0/spec/defines/cinder_type_spec.rb 2016-04-21 07:45:36.053871835 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- #Author: Andrew Woodward <[email protected]>
-
- require 'spec_helper'
-@@ -24,7 +28,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 2016-04-21 07:44:47.661447131 -0700
-+++ openstack-cinder-6.1.0/manifests/type_set.pp 2016-04-21 07:45:41.645429540 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # ==Define: cinder::type_set
- #
- # Assigns keys after the volume type is set.
-@@ -58,7 +62,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 2016-04-21 07:44:52.352619515 -0700
-+++ openstack-cinder-6.1.0/manifests/type.pp 2016-04-21 07:45:48.039994336 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # == Define: cinder::type
- #
- # Creates cinder type and assigns backends.
-@@ -66,7 +70,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'],
--- a/components/ruby/puppet-modules/openstack-glance/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-glance/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-glance
-COMPONENT_VERSION= 6.1.0
+COMPONENT_VERSION= 8.2.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)
+ sha256:6d835786c8d8e7d683b18cf0c241bc0cb2a84622ec93f06df4f5f02b6f0c2ec0
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-glance/puppet-glance-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/glance
-TPNO= 25366
+TPNO= 30875
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/openstack-glance/openstack-glance.p5m Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-glance/openstack-glance.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -44,71 +44,149 @@
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/examples/glance_multi_store.pp
+file path=etc/puppet/modules/glance/examples/glance_single_store.pp
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_glare_config/ini_setting.rb
+file path=etc/puppet/modules/glance/lib/puppet/provider/glance_glare_paste_ini/ini_setting.rb
+file path=etc/puppet/modules/glance/lib/puppet/provider/glance_image/openstack.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/provider/glance_swift_config/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_glare_config.rb
+file path=etc/puppet/modules/glance/lib/puppet/type/glance_glare_paste_ini.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/lib/puppet/type/glance_swift_config.rb
file path=etc/puppet/modules/glance/manifests/api.pp
+file path=etc/puppet/modules/glance/manifests/api/db.pp
+file path=etc/puppet/modules/glance/manifests/api/logging.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/s3.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/logging.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/db/sync.pp
+file path=etc/puppet/modules/glance/manifests/glare.pp
+file path=etc/puppet/modules/glance/manifests/glare/db.pp
+file path=etc/puppet/modules/glance/manifests/glare/logging.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/keystone/glare_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/manifests/registry/db.pp
+file path=etc/puppet/modules/glance/manifests/registry/logging.pp
file path=etc/puppet/modules/glance/metadata.json
+file path=etc/puppet/modules/glance/releasenotes/notes/deprecate_old_vsphere_backend_parameters-8d798bd64b750911.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/glance-image-id-d1a32b5ec443611e.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/glance-swift-v3-572d506977688377.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/glance_cache_logging-1f53fc9d71d04686.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/glance_db_class-dee87f87e25d0040.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/glance_glare_service-2cd8231e1e7d097b.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/ipv6_registry-95b934a99a6f2639.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/keystone_python_depr-80fa804d9cd242c5.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/multi_store-d53d0e440b55e9d6.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/new_service_name-307a5803a248d2a3.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/registry_ssl-eed9bdc67c795cde.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/remove_cluster_id-da63a8f698b27cec.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/remove_old_auth-d9fc4af8e2ced291.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/remove_posix-d1f775df21874348.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/update_swift-52dfa8715cddbe91.yaml
+file path=etc/puppet/modules/glance/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/glance/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/glance/releasenotes/source/conf.py
+file path=etc/puppet/modules/glance/releasenotes/source/index.rst
+file path=etc/puppet/modules/glance/releasenotes/source/mitaka.rst
+file path=etc/puppet/modules/glance/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/glance/setup.cfg
+file path=etc/puppet/modules/glance/setup.py
file path=etc/puppet/modules/glance/spec/acceptance/basic_glance_spec.rb
+file path=etc/puppet/modules/glance/spec/acceptance/glance_config_spec.rb
+file path=etc/puppet/modules/glance/spec/acceptance/nodesets/centos-70-x64.yml
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/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=etc/puppet/modules/glance/spec/classes/glance_api_db_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_api_logging_spec.rb
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_s3_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_logging_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_config_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_db_sync_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_glare_db_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_glare_logging_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_glare_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_keystone_glare_auth_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_db_spec.rb
+file path=etc/puppet/modules/glance/spec/classes/glance_registry_logging_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_api_config/ini_setting_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/provider/glance_api_paste_ini/ini_setting_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/provider/glance_cache_config/ini_setting_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/provider/glance_glare_config/ini_setting_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/provider/glance_glare_paste_ini/ini_setting_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/provider/glance_image_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/provider/glance_registry_config/ini_setting_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/provider/glance_registry_paste_ini/ini_setting_spec.rb
file path=etc/puppet/modules/glance/spec/unit/provider/glance_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/provider/glance_swift_config/ini_setting_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/type/glance_api_config_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/type/glance_api_paste_ini_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/type/glance_cache_config_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/type/glance_glare_config_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/type/glance_glare_paste_ini_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/type/glance_registry_config_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/type/glance_registry_paste_ini_spec.rb
+file path=etc/puppet/modules/glance/spec/unit/type/glance_swift_config_spec.rb
+file path=etc/puppet/modules/glance/test-requirements.txt
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
+file path=etc/puppet/modules/glance/tox.ini
#
license openstack-glance.license license="Apache v2.0"
@@ -123,3 +201,4 @@
# force a dependency on puppetlabs-stdlib
depend type=require fmri=system/management/puppet/puppetlabs-stdlib
+
--- a/components/ruby/puppet-modules/openstack-glance/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-glance/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,28 +2,20 @@
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
-@@ -49,6 +49,13 @@
- "12.04",
+--- openstack-glance-8.2.0/metadata.json.orig 2016-08-07 10:42:36.577837469 -0700
++++ openstack-glance-8.2.0/metadata.json 2016-08-07 10:43:02.663963045 -0700
+@@ -29,6 +29,13 @@
+ "operatingsystemrelease": [
"14.04"
]
+ },
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
}
],
- "description": "Installs and configures OpenStack Glance (Image Service)."
+ "description": "Installs and configures OpenStack Glance (Image Service).",
---- openstack-glance-6.1.0/README.md.orig 2016-04-27 11:26:17.640775748 -0700
-+++ openstack-glance-6.1.0/README.md 2016-04-27 11:25:41.091511562 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- glance
- =======
-
--- a/components/ruby/puppet-modules/openstack-glance/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-glance/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,9 +2,9 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-glance-6.1.0/manifests/params.pp.orig 2016-04-21 07:49:15.937218438 -0700
-+++ openstack-glance-6.1.0/manifests/params.pp 2016-04-21 07:49:38.722449269 -0700
-@@ -1,14 +1,15 @@
+--- openstack-glance-8.0.1/manifests/params.pp.orig 2016-05-06 08:03:31.669873231 -0700
++++ openstack-glance-8.0.1/manifests/params.pp 2016-05-06 08:06:03.214534543 -0700
+@@ -1,14 +1,16 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
@@ -12,7 +12,7 @@
# 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'
@@ -24,36 +24,36 @@
+ $cache_cleaner_command = 'glance-cache-cleaner'
+ $cache_pruner_command = 'glance-cache-pruner'
$api_package_name = 'openstack-glance'
+ $glare_package_name = 'openstack-glance'
$registry_package_name = 'openstack-glance'
- $api_service_name = 'openstack-glance-api'
-@@ -21,6 +22,9 @@
- }
+@@ -24,6 +26,9 @@ class glance::params {
+ $pymysql_package_name = undef
}
'Debian': {
+ $client_package_name = 'python-glanceclient'
+ $cache_cleaner_command = 'glance-cache-cleaner'
+ $cache_pruner_command = 'glance-cache-pruner'
$api_package_name = 'glance-api'
+ $glare_package_name = 'glance-glare'
$registry_package_name = 'glance-registry'
- $api_service_name = 'glance-api'
-@@ -28,8 +32,19 @@
- $db_sync_command = 'glance-manage --config-file=/etc/glance/glance-registry.conf db_sync'
- $pyceph_package_name = 'python-ceph'
+@@ -34,6 +39,20 @@ class glance::params {
+ $sqlite_package_name = 'python-pysqlite2'
+ $pymysql_package_name = 'python-pymysql'
}
+ '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'
++ $glare_package_name = undef
+ $registry_package_name = 'cloud/openstack/glance'
+ $api_service_name = 'application/openstack/glance/glance-api'
++ $glare_service_name = undef
+ $registry_service_name = 'application/openstack/glance/glance-registry'
-+ $db_sync_command = undef
++ $pyceph_package_name = undef
++ $sqlite_package_name = undef
++ $pymysql_package_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")
+ fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian")
}
- }
-
--- a/components/ruby/puppet-modules/openstack-glance/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-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 2016-04-21 07:51:03.237198178 -0700
-+++ openstack-glance-6.1.0/manifests/init.pp 2016-04-21 07:51:32.893728947 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # == class: glance
- #
- # base glance config.
-@@ -15,13 +19,6 @@
-
- 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,
--- a/components/ruby/puppet-modules/openstack-glance/patches/04-registry.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-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 2016-04-21 07:52:19.885897917 -0700
-+++ openstack-glance-6.1.0/manifests/registry.pp 2016-04-21 07:52:49.376252569 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # == Class: glance::registry
- #
- # Installs and configures glance-registry
-@@ -171,7 +175,6 @@
- )
- }
-
-- 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' |>
-@@ -179,9 +182,6 @@
-
- File {
- ensure => present,
-- owner => 'glance',
-- group => 'glance',
-- mode => '0640',
- notify => Service['glance-registry'],
- require => Class['glance']
- }
--- a/components/ruby/puppet-modules/openstack-glance/patches/05-api.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-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 2016-04-21 07:53:25.924267344 -0700
-+++ openstack-glance-6.1.0/manifests/api.pp 2016-04-21 07:53:40.217588163 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # == Class glance::api
- #
- # Configure API service in glance
-@@ -248,7 +252,6 @@
- )
- }
-
-- 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<||>
-@@ -265,9 +268,6 @@
-
- File {
- ensure => present,
-- owner => 'glance',
-- group => 'glance',
-- mode => '0640',
- notify => Service['glance-api'],
- require => Class['glance']
- }
--- a/components/ruby/puppet-modules/openstack-heat/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-heat
-COMPONENT_VERSION= 6.1.0
+COMPONENT_VERSION= 8.2.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)
+ sha256:2cbd4c7558b6095a573482d3bfe2ead36b5bbdd4a68e76fc2a5a3f6476abfbca
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-heat/puppet-heat-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/heat
-TPNO= 25368
+TPNO= 30876
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/openstack-heat/openstack-heat.p5m Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/openstack-heat.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -45,14 +45,21 @@
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_api_paste_ini/ini_setting.rb
file path=etc/puppet/modules/heat/lib/puppet/provider/heat_config/ini_setting.rb
+file path=etc/puppet/modules/heat/lib/puppet/type/heat_api_paste_ini.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/config.pp
+file path=etc/puppet/modules/heat/manifests/cron/purge_deleted.pp
+file path=etc/puppet/modules/heat/manifests/db.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/db/sync.pp
+file path=etc/puppet/modules/heat/manifests/deps.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
@@ -62,16 +69,37 @@
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/releasenotes/notes/api_paste-b94e191896840944.yaml
+file path=etc/puppet/modules/heat/releasenotes/notes/crontab_purge-89f321e9cf966933.yaml
+file path=etc/puppet/modules/heat/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/heat/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=etc/puppet/modules/heat/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=etc/puppet/modules/heat/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/heat/releasenotes/notes/versionless-auth-urls-08c741084b9a9040.yaml
+file path=etc/puppet/modules/heat/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/heat/releasenotes/source/conf.py
+file path=etc/puppet/modules/heat/releasenotes/source/index.rst
+file path=etc/puppet/modules/heat/releasenotes/source/mitaka.rst
+file path=etc/puppet/modules/heat/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/heat/setup.cfg
+file path=etc/puppet/modules/heat/setup.py
file path=etc/puppet/modules/heat/spec/acceptance/basic_heat_spec.rb
+file path=etc/puppet/modules/heat/spec/acceptance/nodesets/centos-70-x64.yml
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/acceptance/nodesets/ubuntu-server-1404-x64.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_config_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_cron_purge_deleted_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_db_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_db_sync_spec.rb
+file path=etc/puppet/modules/heat/spec/classes/heat_deps_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
@@ -82,6 +110,12 @@
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
+file path=etc/puppet/modules/heat/spec/unit/provider/heat_api_paste_ini/ini_setting_spec.rb
+file path=etc/puppet/modules/heat/spec/unit/provider/heat_config/ini_setting_spec.rb
+file path=etc/puppet/modules/heat/spec/unit/type/heat_api_paste_ini_spec.rb
+file path=etc/puppet/modules/heat/spec/unit/type/heat_config_spec.rb
+file path=etc/puppet/modules/heat/test-requirements.txt
+file path=etc/puppet/modules/heat/tox.ini
#
license openstack-heat.license license="Apache v2.0"
--- a/components/ruby/puppet-modules/openstack-heat/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,28 +2,20 @@
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
-@@ -49,6 +49,13 @@
- "12.04",
+--- openstack-heat-8.2.0/metadata.json.orig 2016-08-07 10:47:35.933281935 -0700
++++ openstack-heat-8.2.0/metadata.json 2016-08-07 10:47:59.643000797 -0700
+@@ -29,6 +29,13 @@
+ "operatingsystemrelease": [
"14.04"
]
+ },
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
}
],
- "description": "Installs and configures OpenStack Heat (Orchestration)."
+ "description": "Installs and configures OpenStack Heat (Orchestration).",
---- openstack-heat-6.1.0/README.md.orig 2016-04-27 11:27:38.775478579 -0700
-+++ openstack-heat-6.1.0/README.md 2016-04-27 11:28:00.603876454 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- puppet-heat
- =============
-
--- a/components/ruby/puppet-modules/openstack-heat/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,8 +2,8 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-heat-6.1.0/manifests/params.pp.orig 2016-04-21 08:02:17.732256206 -0700
-+++ openstack-heat-6.1.0/manifests/params.pp 2016-04-21 08:02:43.009849321 -0700
+--- openstack-heat-8.2.0/manifests/params.pp.orig 2016-04-21 08:02:17.732256206 -0700
++++ openstack-heat-8.2.0/manifests/params.pp 2016-04-21 08:02:43.009849321 -0700
@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
@@ -12,7 +12,7 @@
# == Class: heat::params
#
# Parameters for puppet-heat
-@@ -45,10 +49,24 @@
+@@ -46,10 +50,24 @@
}
}
}
@@ -34,7 +34,7 @@
fail("Unsupported osfamily: ${::osfamily} operatingsystem: \
${::operatingsystem}, module ${module_name} only support osfamily \
-RedHat and Debian")
-+Solaris, RedHat, and Debian")
++RedHat, Debian, and Solaris")
}
}
}
--- a/components/ruby/puppet-modules/openstack-heat/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-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 2016-04-21 08:04:30.412621338 -0700
-+++ openstack-heat-6.1.0/manifests/init.pp 2016-04-21 08:05:31.892759394 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # == Class: heat
- #
- # Heat base package & configuration
-@@ -265,30 +269,12 @@
- 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':
--- a/components/ruby/puppet-modules/openstack-heat/patches/04-api.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/patches/04-api.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,51 +12,16 @@
# == Class: heat::api
#
# Installs & configure the heat API service
-@@ -62,12 +66,22 @@
- 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 {
-@@ -78,12 +92,6 @@
+@@ -72,12 +76,6 @@ class heat::api (
}
}
-
+
- package { 'heat-api':
- ensure => $package_ensure,
- name => $::heat::params::api_package_name,
-- tag => 'openstack',
+- tag => ['openstack', 'heat-package'],
- }
-
if $manage_service {
if $enabled {
$service_ensure = 'running'
-@@ -99,7 +107,7 @@
- hasstatus => true,
- hasrestart => true,
- require => [Package['heat-common'],
-- Package['heat-api']],
-+ Package[$::heat::params::api_package_name]],
- subscribe => $::heat::subscribe_sync_db,
- }
-
--- a/components/ruby/puppet-modules/openstack-heat/patches/05-engine.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-heat/patches/05-engine.patch Wed Sep 07 14:48:35 2016 -0700
@@ -4,7 +4,6 @@
--- openstack-heat-6.1.0/manifests/engine.pp.orig 2016-04-21 08:07:38.280309372 -0700
+++ openstack-heat-6.1.0/manifests/engine.pp 2016-04-21 08:07:53.510837943 -0700
-@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
@@ -12,42 +11,16 @@
# == Class: heat::engine
#
# Installs & configure the heat engine service
-@@ -109,16 +113,21 @@
+@@ -122,12 +126,6 @@ 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,
+- tag => ['openstack', 'heat-package'],
- }
-+ Package[$::heat::params::engine_package_name] -> Heat_config<||>
-+ Package[$::heat::params::engine_package_name] -> Service['heat-engine']
-
+-
if $manage_service {
if $enabled {
-@@ -143,7 +152,7 @@
- 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,
- }
-
+ $service_ensure = 'running'
--- a/components/ruby/puppet-modules/openstack-horizon/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-horizon
-COMPONENT_VERSION= 6.1.0
+COMPONENT_VERSION= 8.2.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)
+ sha256:1f7e53b4b59b2aebb53861a4e3f9bd5178e9aa4a9dbec3dae2876927e2002e46
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-horizon/puppet-horizon-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/horizon
-TPNO= 25370
+TPNO= 30877
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/openstack-horizon/openstack-horizon.p5m Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/openstack-horizon.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -49,27 +49,43 @@
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/releasenotes/notes/apache_ports-5d0eb0ca775ad7d1.yaml
+file path=etc/puppet/modules/horizon/releasenotes/notes/horizon_django_cache_compress_ubuntu-e1807c69e52048fd.yaml
+file path=etc/puppet/modules/horizon/releasenotes/notes/keystone_v3-d381e37592d3b29b.yaml
+file path=etc/puppet/modules/horizon/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/horizon/releasenotes/notes/remove_lesscpy-b4b677de57351078.yaml
+file path=etc/puppet/modules/horizon/releasenotes/notes/root_url-cede3a4a7ecafdf9.yaml
+file path=etc/puppet/modules/horizon/releasenotes/notes/trigger_collectstatic-fb465ebec48b3bc7.yaml
+file path=etc/puppet/modules/horizon/releasenotes/notes/update_local_settings_mitaka-f182327ce660fda0.yaml
+file path=etc/puppet/modules/horizon/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/horizon/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/horizon/releasenotes/source/conf.py
+file path=etc/puppet/modules/horizon/releasenotes/source/index.rst
+file path=etc/puppet/modules/horizon/releasenotes/source/mitaka.rst
+file path=etc/puppet/modules/horizon/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/horizon/setup.cfg
+file path=etc/puppet/modules/horizon/setup.py
file path=etc/puppet/modules/horizon/spec/acceptance/horizon_with_apache_spec.rb
+file path=etc/puppet/modules/horizon/spec/acceptance/nodesets/centos-70-x64.yml
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/acceptance/nodesets/ubuntu-server-1404-x64.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
+file path=etc/puppet/modules/horizon/test-requirements.txt
+file path=etc/puppet/modules/horizon/tox.ini
#
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
--- a/components/ruby/puppet-modules/openstack-horizon/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,28 +2,20 @@
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
-@@ -48,6 +48,13 @@
- "12.04",
+--- openstack-horizon-8.2.0/metadata.json.orig 2016-08-07 10:54:47.621488025 -0700
++++ openstack-horizon-8.2.0/metadata.json 2016-08-07 10:55:10.202795687 -0700
+@@ -30,6 +30,13 @@
"14.04"
]
-+ },
+ }
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
- }
++ }
],
- "description": "Installs and configures OpenStack Horizon (Dashboard)."
+ "description": "Installs and configures OpenStack Horizon (Dashboard).",
+ "dependencies": [
---- openstack-horizon-6.1.0/README.md.orig 2016-04-27 11:29:04.563218110 -0700
-+++ openstack-horizon-6.1.0/README.md 2016-04-27 11:29:29.401646350 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- horizon
- =======
-
--- a/components/ruby/puppet-modules/openstack-horizon/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
@@ -25,7 +25,7 @@
$http_service = 'httpd'
$http_modwsgi = 'mod_wsgi'
$package_name = 'openstack-dashboard'
-@@ -21,6 +24,9 @@
+@@ -22,6 +25,9 @@
$wsgi_group = 'dashboard'
}
'Debian': {
@@ -35,7 +35,7 @@
$http_service = 'apache2'
$config_file = '/etc/openstack-dashboard/local_settings.py'
$httpd_listen_config_file = '/etc/apache2/ports.conf'
-@@ -40,8 +46,23 @@
+@@ -42,8 +48,23 @@
}
}
}
@@ -56,7 +56,7 @@
+ }
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")
++ fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat, Debian, and Solaris")
}
}
}
--- a/components/ruby/puppet-modules/openstack-horizon/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,20 +2,12 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-horizon-6.1.0/manifests/init.pp.orig 2016-04-21 08:11:23.146692638 -0700
-+++ openstack-horizon-6.1.0/manifests/init.pp 2016-04-21 08:11:37.446431463 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # == Class: horizon
- #
- # Installs Horizon dashboard with Apache
-@@ -201,6 +205,26 @@
- # (optional) Tuskar-UI - Deployment mode ('poc' or 'scale')
- # Defaults to 'scale'
- #
+--- openstack-horizon-8.2.0/manifests/init.pp.orig 2016-08-07 10:59:15.528518714 -0700
++++ openstack-horizon-8.2.0/manifests/init.pp 2016-08-07 11:02:05.803099181 -0700
+@@ -268,6 +268,25 @@
+ # [*timezone*]
+ # (optional) The timezone of the server.
+ # Defaults to 'UTC'.
+# [*docroot*]
+# (optional) The DocumentRoot setting
+# Defaults to '/var/www'
@@ -35,14 +27,13 @@
+# [*overrides*]
+# (optional) Python module to use for overrides
+#
-+#
+ #
# === Examples
#
- # class { 'horizon':
-@@ -251,6 +275,11 @@
- $tuskar_ui_ironic_discoverd_url = 'http://127.0.0.1:5050',
- $tuskar_ui_undercloud_admin_password = undef,
- $tuskar_ui_deployment_mode = 'scale',
+@@ -332,6 +351,11 @@ class horizon(
+ $root_url = $::horizon::params::root_url,
+ $session_timeout = 1800,
+ $timezone = 'UTC',
+ $docroot = '/var/www',
+ $static_alias = '/usr/share/openstack-dashboard/static',
+ $static_root = undef,
@@ -51,39 +42,40 @@
# DEPRECATED PARAMETERS
$can_set_mount_point = undef,
$vhost_extra_params = undef,
-@@ -314,18 +343,16 @@
+@@ -404,16 +428,18 @@ class horizon(
order => '50',
}
-- package { 'python-lesscpy':
-- ensure => $package_ensure,
+- exec { 'refresh_horizon_django_cache':
+- command => "${::horizon::params::manage_py} collectstatic --noinput --clear",
+- refreshonly => true,
+- require => Package['horizon'],
- }
--
-- 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",
++ command => "${::horizon::params::manage_py} collectstatic --noinput --clear",
+ refreshonly => true,
-+ require => [Package['python-lesscpy'], Package['horizon']],
++ require => Package['horizon'],
++ }
+
+- exec { 'refresh_horizon_django_compress':
+- command => "${::horizon::params::manage_py} compress --force",
+- refreshonly => true,
+- require => Package['horizon'],
++ exec { 'refresh_horizon_django_compress':
++ command => "${::horizon::params::manage_py} compress --force",
++ refreshonly => true,
++ require => 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 {
-@@ -338,6 +365,8 @@
+ if $compress_offline {
+@@ -433,6 +459,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,
- }
- }
+ redirect_type => $redirect_type,
+ root_url => $root_url
--- a/components/ruby/puppet-modules/openstack-horizon/patches/04-template.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/04-template.patch Wed Sep 07 14:48:35 2016 -0700
@@ -10,9 +10,9 @@
+#######################################################################
+
import os
-
+
from django.utils.translation import ugettext_lazy as _
-@@ -76,6 +80,9 @@
+@@ -108,6 +112,9 @@ HORIZON_CONFIG = {
'exceptions': {'recoverable': exceptions.RECOVERABLE,
'not_found': exceptions.NOT_FOUND,
'unauthorized': exceptions.UNAUTHORIZED},
@@ -20,26 +20,20 @@
+ 'customization_module': "<%= @overrides %>"
+<% end %>
}
-
- # Specify a regular expression to validate user passwords.
-@@ -345,13 +352,6 @@
- 'filename': '<%= scope.lookupvar("horizon::params::logdir") %>/horizon.log',
- 'formatter': 'verbose',
- },
-- 'syslog': {
-- 'level': '<%= @log_level %>',
-- 'facility': 'local1',
-- 'class': 'logging.handlers.SysLogHandler',
+
+ # If provided, a "Report Bug" link will be displayed in the site header
+@@ -616,7 +623,6 @@ LOGGING = {
+ 'level': '<%= @log_level %>',
+ 'facility': 'local1',
+ 'class': 'logging.handlers.SysLogHandler',
- 'address': '/dev/log',
-- 'formatter': 'normal',
-- }
+ 'formatter': 'normal',
+ }
},
- 'loggers': {
- # Logging from django.db.backends is VERY verbose, send to null
-@@ -574,14 +574,27 @@
- LOGOUT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>/auth/logout/'
- LOGIN_REDIRECT_URL = '<%= scope.lookupvar("horizon::params::root_url") %>'
-
+@@ -841,14 +847,27 @@ SECURITY_GROUP_RULES = {
+
+ SESSION_TIMEOUT = <%= @session_timeout %>
+
-# 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.
@@ -60,7 +54,7 @@
+# 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.
@@ -68,5 +62,5 @@
+# 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 %>
--- a/components/ruby/puppet-modules/openstack-horizon/patches/05-apache.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-horizon/patches/05-apache.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,7 +12,7 @@
# == Class: horizon::wsgi::apache
#
# Configures Apache WSGI for Horizon.
-@@ -56,6 +60,14 @@
+@@ -62,6 +66,14 @@
# (Optional) Description
# Defaults to 'horizon_ssl_vhost'.
#
@@ -27,45 +27,47 @@
# [*extra_params*]
# (optional) A hash of extra paramaters for apache::wsgi class.
# Defaults to {}
-@@ -74,6 +86,8 @@
+@@ -96,6 +108,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 = {},
- ) {
-
-@@ -132,7 +146,11 @@
- $redirect_url = $::horizon::params::root_url
+ $redirect_type = 'permanent',
+ $root_url = $::horizon::params::root_url,
+@@ -168,7 +182,11 @@ class horizon::wsgi::apache (
+ fail("Invalid redirect type '${redirect_type} provided.")
}
-
-- Package['horizon'] -> Package[$::horizon::params::http_service]
+
+- Package['horizon'] -> Package['httpd']
+ if $::osfamily == 'Solaris' {
+ Package[$::horizon::params::package_name] -> Package['web/server/apache-24']
+ } else {
-+ Package['horizon'] -> Package[$::horizon::params::http_service]
++ Package['horizon'] -> Package['httpd']
+ }
- File[$::horizon::params::config_file] ~> Service[$::horizon::params::http_service]
-
+ File[$::horizon::params::config_file] ~> Service['httpd']
+
$unix_user = $::osfamily ? {
-@@ -150,7 +168,7 @@
+@@ -186,7 +204,7 @@ class horizon::wsgi::apache (
group => $unix_group,
- before => Service[$::horizon::params::http_service],
+ before => Service['httpd'],
mode => '0751',
- require => Package['horizon'],
+ require => Package[$::horizon::params::package_name],
}
-
+
file { "${::horizon::params::logdir}/horizon.log":
-@@ -159,19 +177,19 @@
+@@ -195,7 +213,7 @@ class horizon::wsgi::apache (
group => $unix_group,
- before => Service[$::horizon::params::http_service],
+ before => Service['httpd'],
mode => '0640',
- require => [ File[$::horizon::params::logdir], Package['horizon'] ],
+ require => [ File[$::horizon::params::logdir], Package[$::horizon::params::package_name] ],
}
-
+
+ $script_url = $root_url ? {
+@@ -206,13 +224,13 @@ class horizon::wsgi::apache (
$default_vhost_conf_no_ip = {
servername => $servername,
serveraliases => os_any2array($final_server_aliases),
@@ -75,9 +77,9 @@
error_log_file => 'horizon_error.log',
priority => $priority,
aliases => [{
- alias => "${$::horizon::params::root_url}/static",
+ alias => "${root_url}/static",
- path => '/usr/share/openstack-dashboard/static',
+ path => $static_alias,
}],
- port => 80,
+ port => $http_port,
ssl_cert => $horizon_cert,
--- a/components/ruby/puppet-modules/openstack-ironic/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-ironic/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-ironic
-COMPONENT_VERSION= 6.1.0
+COMPONENT_VERSION= 8.2.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)
+ sha256:fb507b05a78be13601ded35e35d5e6afc339673ad5fe1837afcc402e925c02ce
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-ironic/puppet-ironic-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/ironic
-TPNO= 25373
+TPNO= 30878
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/openstack-ironic/openstack-ironic.p5m Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-ironic/openstack-ironic.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -46,40 +46,96 @@
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_api_paste_ini/ini_setting.rb
file path=etc/puppet/modules/ironic/lib/puppet/provider/ironic_config/ini_setting.rb
+file path=etc/puppet/modules/ironic/lib/puppet/provider/ironic_inspector_config/ini_setting.rb
+file path=etc/puppet/modules/ironic/lib/puppet/type/ironic_api_paste_ini.rb
file path=etc/puppet/modules/ironic/lib/puppet/type/ironic_config.rb
+file path=etc/puppet/modules/ironic/lib/puppet/type/ironic_inspector_config.rb
file path=etc/puppet/modules/ironic/manifests/api.pp
+file path=etc/puppet/modules/ironic/manifests/bifrost.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/config.pp
+file path=etc/puppet/modules/ironic/manifests/db.pp
+file path=etc/puppet/modules/ironic/manifests/db/inspector_sync.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/db/sync.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/inspector.pp
+file path=etc/puppet/modules/ironic/manifests/inspector/logging.pp
file path=etc/puppet/modules/ironic/manifests/keystone/auth.pp
+file path=etc/puppet/modules/ironic/manifests/keystone/auth_inspector.pp
+file path=etc/puppet/modules/ironic/manifests/logging.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/manifests/wsgi/apache.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/releasenotes/notes/api_paste-b94e191896840944.yaml
+file path=etc/puppet/modules/ironic/releasenotes/notes/api_wsgi-e8eb12b8e66ffe4e.yaml
+file path=etc/puppet/modules/ironic/releasenotes/notes/deprecate_cluster_id-8d9838a9ef8932bf.yaml
+file path=etc/puppet/modules/ironic/releasenotes/notes/inspector_mitaka-5984d9af2ba56cb3.yaml
+file path=etc/puppet/modules/ironic/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/ironic/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=etc/puppet/modules/ironic/releasenotes/notes/remove_old_auth-d9fc4af8e2ced291.yaml
+file path=etc/puppet/modules/ironic/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=etc/puppet/modules/ironic/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/ironic/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/ironic/releasenotes/source/conf.py
+file path=etc/puppet/modules/ironic/releasenotes/source/index.rst
+file path=etc/puppet/modules/ironic/releasenotes/source/mitaka.rst
+file path=etc/puppet/modules/ironic/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/ironic/setup.cfg
+file path=etc/puppet/modules/ironic/setup.py
+file path=etc/puppet/modules/ironic/spec/acceptance/ironic_wsgi_apache_spec.rb
+file path=etc/puppet/modules/ironic/spec/acceptance/nodesets/centos-70-x64.yml
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/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=etc/puppet/modules/ironic/spec/classes/inspector_db_sync_spec.rb
file path=etc/puppet/modules/ironic/spec/classes/ironic_api_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_bifrost_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_config_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_db_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_db_sync_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_inspector_logging_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_inspector_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_keystone_auth_inspector_spec.rb
file path=etc/puppet/modules/ironic/spec/classes/ironic_keystone_auth_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_logging_spec.rb
file path=etc/puppet/modules/ironic/spec/classes/ironic_policy_spec.rb
+file path=etc/puppet/modules/ironic/spec/classes/ironic_wsgi_apache_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_api_paste_ini/ini_setting_spec.rb
+file path=etc/puppet/modules/ironic/spec/unit/provider/ironic_config/ini_setting_spec.rb
+file path=etc/puppet/modules/ironic/spec/unit/provider/ironic_inspector_config/ini_setting_spec.rb
file path=etc/puppet/modules/ironic/spec/unit/provider/ironic_spec.rb
+file path=etc/puppet/modules/ironic/spec/unit/type/ironic_api_paste_ini_spec.rb
+file path=etc/puppet/modules/ironic/spec/unit/type/ironic_config_spec.rb
+file path=etc/puppet/modules/ironic/spec/unit/type/ironic_inspector_config_spec.rb
+file path=etc/puppet/modules/ironic/templates/baremetal.json.erb
+file path=etc/puppet/modules/ironic/templates/bifrost_global_vars.erb
+file path=etc/puppet/modules/ironic/templates/inspector_dnsmasq_http.erb
+file path=etc/puppet/modules/ironic/templates/inspector_dnsmasq_tftp.erb
+file path=etc/puppet/modules/ironic/templates/inspector_ipxe.erb
+file path=etc/puppet/modules/ironic/templates/inspector_pxelinux_cfg.erb
+file path=etc/puppet/modules/ironic/test-requirements.txt
+file path=etc/puppet/modules/ironic/tox.ini
#
license openstack-ironic.license license="Apache v2.0"
--- a/components/ruby/puppet-modules/openstack-ironic/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-ironic/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,28 +2,20 @@
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
-@@ -49,6 +49,13 @@
- "12.04",
+--- openstack-ironic-8.2.0/metadata.json.orig 2016-08-07 11:10:16.329190221 -0700
++++ openstack-ironic-8.2.0/metadata.json 2016-08-07 11:10:40.275178865 -0700
+@@ -29,6 +29,13 @@
+ "operatingsystemrelease": [
"14.04"
]
+ },
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
}
],
- "description": "Installs and configures OpenStack Ironic (Bare metal)."
+ "description": "Installs and configures OpenStack Ironic (Bare metal).",
---- openstack-ironic-6.1.0/README.md.orig 2016-04-27 12:10:55.565966448 -0700
-+++ openstack-ironic-6.1.0/README.md 2016-04-27 12:11:09.408845368 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- puppet-ironic
- =============
-
--- a/components/ruby/puppet-modules/openstack-ironic/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-ironic/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,7 +12,7 @@
#
# Copyright (C) 2013 eNovance SAS <[email protected]>
#
-@@ -40,6 +44,14 @@
+@@ -62,6 +66,14 @@
$conductor_package = 'ironic-conductor'
$client_package = 'python-ironicclient'
}
--- a/components/ruby/puppet-modules/openstack-ironic/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-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/init.pp.orig 2016-07-15 06:51:00.582272443 -0700
-+++ openstack-ironic-6.1.0/manifests/init.pp 2016-07-15 06:51:18.547014300 -0700
-@@ -265,10 +265,18 @@ class ironic (
- require 'mysql::bindings::python'
- }
- /postgresql:\/\/\S+:\S+@\S+\/\S+/: {
-- $database_backend_package = 'python-psycopg2'
-+ if ($::osfamily == 'Solaris') {
-+ $database_backend_package = false
-+ } else {
-+ $database_backend_package = 'python-psycopg2'
-+ }
- }
- /sqlite:\/\//: {
-- $database_backend_package = 'python-pysqlite2'
-+ if ($::osfamily == 'Solaris') {
-+ $database_backend_package = false
-+ } else {
-+ $database_backend_package = 'python-pysqlite2'
-+ }
- }
- default: {
- fail("Invalid database connection: ${database_connection}")
--- a/components/ruby/puppet-modules/openstack-keystone/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-keystone/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-keystone
-COMPONENT_VERSION= 6.1.0
+COMPONENT_VERSION= 8.2.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)
+ sha256:cc65b9cfda26f35ed77b3de466cdb1b9898111c08c0b81daa053caf511cdbd83
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-keystone/puppet-keystone-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/keystone
-TPNO= 25375
+TPNO= 30879
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/openstack-keystone/openstack-keystone.p5m Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-keystone/openstack-keystone.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -48,17 +48,22 @@
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/k2k_sp_shib.pp
+file path=etc/puppet/modules/keystone/examples/ldap_backend.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/user_project_user_role_composite_namevar.pp
file path=etc/puppet/modules/keystone/examples/v3_basic.pp
+file path=etc/puppet/modules/keystone/examples/v3_domain_configuration.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_domain_config/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_identity_provider/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
@@ -67,23 +72,39 @@
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_domain_config.rb
file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_endpoint.rb
+file path=etc/puppet/modules/keystone/lib/puppet/type/keystone_identity_provider.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/lib/puppet_x/keystone/composite_namevar.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar/helpers.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/composite_namevar/helpers/utilities.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type/default_domain.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type/read_only.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone/type/required.rb
+file path=etc/puppet/modules/keystone/lib/puppet_x/keystone_config/ini_setting.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.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/deps.pp
+file path=etc/puppet/modules/keystone/manifests/disable_admin_token_auth.pp
file path=etc/puppet/modules/keystone/manifests/endpoint.pp
+file path=etc/puppet/modules/keystone/manifests/federation/identity_provider.pp
+file path=etc/puppet/modules/keystone/manifests/federation/mellon.pp
+file path=etc/puppet/modules/keystone/manifests/federation/shibboleth.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/ldap_backend.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
@@ -94,33 +115,80 @@
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/releasenotes/notes/deprecated_ldap-02957eb56827ead5.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/disable_admin_token_auth-b82d0aca80d1f091.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/ensure_parameter_service_identity_resource-610076e4902c23ec.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/federation_with_mellon-2f8229c1464b2e0e.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/fix-cache-configs-a3972486723f1d99.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/fix_admin-fee6e76089c07a42.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/fix_endpoint_region-0fa0d89061ebaf12.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/fix_openrc_v2-64049769daf57b65.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/hash_domains-d6a867466bcf324b.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/ipv6_provider-796b60badd356e59.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/keystone-wsgi-scripts-0d772d1f9f2d6c57.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_bootstrap-4bf00198001d3350.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_hooks_support-2c9e8b09bdbd1b5b.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_identity_provider-9b6f6b3ad70c60f3.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/keystone_python_depr-80fa804d9cd242c5.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/manage_ldap_packages-3b739e338f3e59c2.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/multi_domain_configuration-32dc8cbef450f1d6.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/multi_ldap-975858a46dd622a6.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/os_service_default-9caeeb340d4bb303.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/policy_driver-c991dd693d2336fc.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/policy_rc_d_keystone_eventlet-2dc65eb3d27f8969.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/remove_unused_class-0615d6744896ad97.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/stop_posix_and_files-930ee921d0ebead2.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/support_multi_domain-bd04f18aa7913eaa.yaml
+file path=etc/puppet/modules/keystone/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/keystone/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/keystone/releasenotes/source/conf.py
+file path=etc/puppet/modules/keystone/releasenotes/source/index.rst
+file path=etc/puppet/modules/keystone/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/keystone/setup.cfg
+file path=etc/puppet/modules/keystone/setup.py
+file path=etc/puppet/modules/keystone/spec/acceptance/default_domain_spec.rb
+file path=etc/puppet/modules/keystone/spec/acceptance/keystone_federation_identity_provider_spec.rb
+file path=etc/puppet/modules/keystone/spec/acceptance/keystone_federation_shibboleth_spec.rb
file path=etc/puppet/modules/keystone/spec/acceptance/keystone_wsgi_apache_spec.rb
+file path=etc/puppet/modules/keystone/spec/acceptance/nodesets/centos-70-x64.yml
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/acceptance/nodesets/ubuntu-server-1404-x64.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_db_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_db_sync_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_deps_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_disable_admin_token_auth_spec.rb
file path=etc/puppet/modules/keystone/spec/classes/keystone_endpoint_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_federation_identity_provider_spec.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_federation_mellon.rb
+file path=etc/puppet/modules/keystone/spec/classes/keystone_federation_shibboleth.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_ldap_backend_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/shared_examples_acceptance.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_config/ini_setting_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_domain_config/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_identity_provider/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
@@ -128,12 +196,20 @@
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_config_spec.rb
+file path=etc/puppet/modules/keystone/spec/unit/type/keystone_domain_config_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_identity_provider_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_service_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/templates/mellon.conf.erb
+file path=etc/puppet/modules/keystone/templates/shibboleth.conf.erb
+file path=etc/puppet/modules/keystone/test-requirements.txt
file path=etc/puppet/modules/keystone/tests/site.pp
+file path=etc/puppet/modules/keystone/tox.ini
#
license openstack-keystone.license license="Apache v2.0"
--- a/components/ruby/puppet-modules/openstack-keystone/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,28 +2,20 @@
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
-@@ -49,6 +49,13 @@
- "12.04",
+--- openstack-keystone-8.2.0/metadata.json.orig 2016-08-07 11:18:04.925303225 -0700
++++ openstack-keystone-8.2.0/metadata.json 2016-08-07 11:18:27.324583279 -0700
+@@ -30,6 +30,13 @@
"14.04"
]
-+ },
+ }
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
- }
++ }
],
- "description": "Installs and configures OpenStack Keystone (Identity)."
+ "description": "Installs and configures OpenStack Keystone (Identity).",
+ "dependencies": [
---- openstack-keystone-6.1.0/README.md.orig 2016-04-27 12:12:22.955273591 -0700
-+++ openstack-keystone-6.1.0/README.md 2016-04-27 12:12:32.758501010 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- keystone
- =======
-
--- a/components/ruby/puppet-modules/openstack-keystone/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,26 +2,24 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-keystone-6.1.0/manifests/params.pp.orig 2016-04-21 08:16:40.158969865 -0700
-+++ openstack-keystone-6.1.0/manifests/params.pp 2016-04-21 08:16:54.897183391 -0700
-@@ -1,11 +1,15 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- #
+--- openstack-keystone-8.2.0/manifests/params.pp.orig 2016-08-07 11:19:17.404917169 -0700
++++ openstack-keystone-8.2.0/manifests/params.pp 2016-08-07 11:22:50.916040310 -0700
+@@ -2,13 +2,13 @@
# This class contains the platform differences for keystone
#
class keystone::params {
- $client_package_name = 'python-keystone'
-
+ $keystone_user = 'keystone'
+ $keystone_group = 'keystone'
+ $keystone_wsgi_admin_script_path = '/usr/bin/keystone-wsgi-admin'
+ $keystone_wsgi_public_script_path = '/usr/bin/keystone-wsgi-public'
case $::osfamily {
'Debian': {
+ $client_package_name = 'python-keystone'
$package_name = 'keystone'
$service_name = 'keystone'
$keystone_wsgi_script_path = '/usr/lib/cgi-bin/keystone'
-@@ -26,6 +30,7 @@
+@@ -26,6 +26,7 @@ class keystone::params {
}
}
'RedHat': {
@@ -29,18 +27,22 @@
$package_name = 'openstack-keystone'
$service_name = 'openstack-keystone'
$keystone_wsgi_script_path = '/var/www/cgi-bin/keystone'
-@@ -34,5 +39,14 @@
- $keystone_wsgi_script_source = '/usr/share/keystone/keystone.wsgi'
- $paste_config = '/usr/share/keystone/keystone-dist-paste.ini'
+@@ -35,5 +36,17 @@ class keystone::params {
+ $pymysql_package_name = undef
+ $mellon_package_name = 'mod_auth_mellon'
}
+ 'Solaris': {
+ $client_package_name = 'library/python/keystoneclient'
+ $package_name = 'cloud/openstack/keystone'
+ $service_name = 'application/openstack/keystone:default'
-+ $keystone_wsgi_script_path = undef
++ $keystone_wsgi_script_path = '/usr/lib/python2.7/vendor-packages/keystone/httpd/main'
+ $python_memcache_package_name = 'python-memcached'
++ $sqlite_package_name = undef
+ $service_provider = undef
-+ $paste_config = undef
++ $pymysql_package_name = undef
++ $mellon_package_name = undef
+ }
++
}
}
+
--- a/components/ruby/puppet-modules/openstack-keystone/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-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 2016-04-21 08:17:24.676149632 -0700
-+++ openstack-keystone-6.1.0/manifests/init.pp 2016-04-21 08:17:38.287182985 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- #
- # Module for managing keystone config.
- #
-@@ -544,18 +548,12 @@
-
- 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],
- }
--- a/components/ruby/puppet-modules/openstack-keystone/patches/04-client.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-keystone/patches/04-client.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,12 +12,13 @@
# == Class: keystone::client
#
# Installs Keystone client.
-@@ -12,8 +16,15 @@
- $ensure = 'present'
- ) {
-
+@@ -19,10 +23,17 @@ class keystone::client (
+
+ include ::keystone::deps
+
- package { 'python-keystoneclient':
- ensure => $ensure,
+- name => $client_package_name,
- tag => 'openstack',
+ if $::osfamily == 'Solaris' {
+ package { 'library/python/keystoneclient':
@@ -27,7 +28,9 @@
+ } else {
+ package { 'python-keystoneclient':
+ ensure => $ensure,
++ name => $client_package_name,
+ tag => 'openstack',
+ }
}
- }
+
+ include '::openstacklib::openstackclient'
--- a/components/ruby/puppet-modules/openstack-neutron/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-neutron
-COMPONENT_VERSION= 6.1.0
+COMPONENT_VERSION= 8.2.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)
+ sha256:9fd93ec535281e6196fecbe72e99220a0f51fd1c4c288327e5d5daa60b3cd89b
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-neutron/puppet-neutron-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/neutron
-TPNO= 25376
+TPNO= 30880
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/openstack-neutron/openstack-neutron.p5m Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/openstack-neutron.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -45,8 +45,10 @@
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/cisco_ml2.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_l3_with_to_uuid.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
@@ -56,12 +58,14 @@
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_api_paste_ini/ini_setting.rb
+file path=etc/puppet/modules/neutron/lib/puppet/provider/neutron_config/openstackconfig.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_lbaas_service_config/openstackconfig.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
@@ -72,26 +76,30 @@
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_nuage/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_plugin_sriov/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_sriov_agent_config/ini_setting.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/provider/neutron_vpnaas_service_config/openstackconfig.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_api_paste_ini.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_lbaas_service_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
@@ -102,17 +110,20 @@
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_nuage.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_plugin_sriov.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_sriov_agent_config.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/lib/puppet/type/neutron_vpnaas_service_config.rb
+file path=etc/puppet/modules/neutron/manifests/agents/bigswitch.pp
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
@@ -125,23 +136,37 @@
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.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/db/sync.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/arista.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/arista/l3.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/bigswitch.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/bigswitch/restproxy.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco.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/cisco/nexus_switch.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/nexus_switch_server.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/type_nexus_vxlan.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/cisco/ucsm.pp
file path=etc/puppet/modules/neutron/manifests/plugins/ml2/mech_driver.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/midonet.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/ml2/opendaylight.pp
file path=etc/puppet/modules/neutron/manifests/plugins/ml2/type_driver.pp
+file path=etc/puppet/modules/neutron/manifests/plugins/nuage.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/opendaylight.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
@@ -149,11 +174,49 @@
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/manifests/services/lbaas.pp
+file path=etc/puppet/modules/neutron/manifests/services/lbaas/haproxy.pp
+file path=etc/puppet/modules/neutron/manifests/services/lbaas/octavia.pp
+file path=etc/puppet/modules/neutron/manifests/services/vpnaas.pp
file path=etc/puppet/modules/neutron/metadata.json
+file path=etc/puppet/modules/neutron/releasenotes/notes/add_dnsmasq_dns_servers-2dd26f5c9383f836.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/add_geneve_type_driver_configs-e285075b3238b49d.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/add_lbaas_driver_package_to_lbaas_services_class-8d0f51e7be9b5f42.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/add_name_to_uuid_transform.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/added_arista_ml2_plugin-8bfd0c41981dac50.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/api_paste-b94e191896840944.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/consolidate_service_provider_configuration-3ce48947a396ad25.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/deprecate_network_device_mtu-d7f15c98605ac2fb.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/fix_lb_driver-d429a30889ef8f22.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/lbaasv2_agent_and_service-ca5e38a07566ad1e.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/missing_firewall_driver_ml2-24b48831f2d0e62b.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/mitaka_aas-e5243eaac2354e85.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/mitaka_drivers-8c41f528f346a388.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/mitaka_metadata-77ebc004c9064934.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/mitaka_providers-040ac57a732b1e82.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/neutron_availability_zones-80246c2af9a7be08.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/new_auth-2331a620217ccf7c.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/qos-13c0b72fe9a5b502.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/update_plumgrid_config-82f3f631917f0e50.yaml
+file path=etc/puppet/modules/neutron/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/neutron/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/neutron/releasenotes/source/conf.py
+file path=etc/puppet/modules/neutron/releasenotes/source/index.rst
+file path=etc/puppet/modules/neutron/releasenotes/source/mitaka.rst
+file path=etc/puppet/modules/neutron/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/neutron/setup.cfg
+file path=etc/puppet/modules/neutron/setup.py
file path=etc/puppet/modules/neutron/spec/acceptance/basic_neutron_spec.rb
+file path=etc/puppet/modules/neutron/spec/acceptance/neutron_config_spec.rb
+file path=etc/puppet/modules/neutron/spec/acceptance/nodesets/centos-70-x64.yml
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/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=etc/puppet/modules/neutron/spec/classes/neutron_agents_bigswitch.rb
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
@@ -167,27 +230,61 @@
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_db_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_db_sync_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_arista_l3_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_arista_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_midonet_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_plugins_ml2_opendaylight_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_nuage_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_ovs_opendaylight_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/classes/neutron_services_lbaas_haproxy_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_services_lbaas_octavia_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_services_lbaas_spec.rb
+file path=etc/puppet/modules/neutron/spec/classes/neutron_services_vpnaas_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_api_config/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_api_paste_ini/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_dhcp_agent_config/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_fwaas_service_config/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_l3_agent_config/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_lbaas_agent_config/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_metadata_agent_config/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_metering_agent_config/ini_setting_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_cisco/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco_credentials/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco_db_conn/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_cisco_l2network/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_midonet/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_ml2/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_nuage/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/provider/neutron_plugin_nvp/ini_setting_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
@@ -197,9 +294,32 @@
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/spec/unit/provider/neutron_vpnaas_agent_config/ini_setting_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_agent_linuxbridge_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_agent_ovs_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_api_paste_ini_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_config_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_dhcp_agent_config_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_fwaas_service_config_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_l3_agent_config_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_lbaas_agent_config_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_metadata_agent_config_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_metering_agent_config_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_credentials_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_db_conn_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_l2network_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_cisco_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_midonet_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_ml2_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_nvp_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_opencontrail_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plugin_plumgrid_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_plumlib_plumgrid_spec.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_subnet.rb
+file path=etc/puppet/modules/neutron/spec/unit/type/neutron_vpnaas_agent_config_spec.rb
file path=etc/puppet/modules/neutron/templates/n1kv.conf.erb
+file path=etc/puppet/modules/neutron/test-requirements.txt
+file path=etc/puppet/modules/neutron/tox.ini
#
license openstack-neutron.license license="Apache v2.0"
--- a/components/ruby/puppet-modules/openstack-neutron/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,37 +2,20 @@
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
-@@ -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": [
-@@ -52,6 +50,13 @@
- "12.04",
+--- openstack-neutron-8.2.0/metadata.json.orig 2016-08-07 11:27:20.747150102 -0700
++++ openstack-neutron-8.2.0/metadata.json 2016-08-07 11:27:41.098304971 -0700
+@@ -29,6 +29,13 @@
+ "operatingsystemrelease": [
"14.04"
]
+ },
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
}
],
- "description": "Installs and configures OpenStack Neutron (Networking)."
+ "description": "Installs and configures OpenStack Neutron (Networking).",
---- openstack-neutron-6.1.0/README.md.orig 2016-04-27 12:13:42.351790597 -0700
-+++ openstack-neutron-6.1.0/README.md 2016-04-27 12:13:53.517298305 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- neutron
- ===================================
-
--- a/components/ruby/puppet-modules/openstack-neutron/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
@@ -11,11 +11,11 @@
+
#
class neutron::params {
-
-@@ -153,6 +157,56 @@
- $cliff_package = 'python-cliff'
- $kernel_headers = "linux-headers-${::kernelrelease}"
-
+
+@@ -175,6 +179,56 @@ class neutron::params {
+
+ $sqlite_package_name = 'python-pysqlite2'
+ $pymysql_package_name = 'python-pymysql'
+ } elsif($::osfamily == 'Solaris') {
+ $nobody_user_group = 'nobody'
+ $package_name = 'cloud/openstack/neutron'
@@ -23,10 +23,10 @@
+ $client_package = 'library/python/neutronclient'
+ $ml2_server_package = false
+ $ovs_agent_package = false
-+ $ovs_agent_service = false
-+ $ovs_server_package = false
++ $ovs_agent_service = 'application/openstack/neutron/neutron-openvswitch-agent:default'
++ $ovs_server_package = 'cloud/openstack/neutron'
+ $ovs_cleanup_service = false
-+ $ovs_package = false
++ $ovs_package = 'service/network/openvswitch'
+ $libnl_package = false
+ $package_provider = 'pkg'
+
@@ -67,5 +67,5 @@
+
+ $kernel_headers = false
} else {
-
+
fail("Unsupported osfamily ${::osfamily}")
--- a/components/ruby/puppet-modules/openstack-neutron/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,62 +2,33 @@
has not yet been submitted upstream due to requirements for 3rd party
CI testing.
---- openstack-neutron-6.1.0/manifests/init.pp.orig 2016-04-21 08:21:08.360074819 -0700
-+++ openstack-neutron-6.1.0/manifests/init.pp 2016-04-21 08:21:20.105597308 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # == Class: neutron
- #
- # Installs the neutron package and configures
-@@ -235,7 +239,7 @@
- $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',
-@@ -312,18 +316,6 @@
- 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,
-@@ -351,7 +343,6 @@
- 'DEFAULT/api_extensions_path': value => $api_extensions_path;
- 'DEFAULT/state_path': value => $state_path;
- 'DEFAULT/lock_path': value => $lock_path;
+--- openstack-neutron-8.2.0/manifests/init.pp.orig 2016-08-07 11:28:30.964369624 -0700
++++ openstack-neutron-8.2.0/manifests/init.pp 2016-08-07 11:30:09.644420742 -0700
+@@ -292,7 +292,7 @@ class neutron (
+ $allow_sorting = $::os_service_default,
+ $allow_overlapping_ips = $::os_service_default,
+ $api_extensions_path = $::os_service_default,
+- $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
++ $root_helper = undef,
+ $root_helper_daemon = $::os_service_default,
+ $report_interval = $::os_service_default,
+ $memcache_servers = false,
+@@ -416,11 +416,16 @@ class neutron (
+ 'DEFAULT/rpc_response_timeout': value => $rpc_response_timeout;
+ 'DEFAULT/global_physnet_mtu': value => pick($network_device_mtu, $global_physnet_mtu);
+ 'oslo_concurrency/lock_path': value => $lock_path;
- 'agent/root_helper': value => $root_helper;
+ 'agent/root_helper_daemon': value => $root_helper_daemon;
'agent/report_interval': value => $report_interval;
}
-
-@@ -374,6 +365,12 @@
- }
- }
-
+
+ if $root_helper {
+ neutron_config {
-+ 'agent/root_helper': value => $root_helper;
++ 'agent/root_helper': value => $root_helper;
+ }
+ }
+
- if $network_device_mtu {
+ if $log_file {
neutron_config {
- 'DEFAULT/network_device_mtu': value => $network_device_mtu;
+ 'DEFAULT/log_file': value => $log_file;
+
--- a/components/ruby/puppet-modules/openstack-neutron/patches/04-vpnaas.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/04-vpnaas.patch Wed Sep 07 14:48:35 2016 -0700
@@ -11,9 +11,9 @@
#
# Copyright (C) 2013 eNovance SAS <[email protected]>
#
-@@ -43,6 +47,12 @@
- # [*ipsec_status_check_interval*]
- # (optional) Status check interval. Defaults to '60'.
+@@ -45,6 +49,12 @@
+ # [*external_network_bridge*]
+ # (optional) Deprecated. Defaults to $::os_service_default
#
+# [*packet_logging*]
+# (optional) For the Solaris driver, enable logging discarded packets.
@@ -24,19 +24,19 @@
class neutron::agents::vpnaas (
$package_ensure = present,
$enabled = true,
-@@ -50,7 +60,9 @@
+@@ -52,7 +62,9 @@ class neutron::agents::vpnaas (
$vpn_device_driver = 'neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver',
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
- $external_network_bridge = undef,
-- $ipsec_status_check_interval = '60'
-+ $ipsec_status_check_interval = '60',
+ $external_network_bridge = $::os_service_default,
+- $ipsec_status_check_interval = $::os_service_default
++ $ipsec_status_check_interval = $::os_service_default,
+ $packet_logging = undef,
+ $logger_level = undef
) {
-
+
include ::neutron::params
-@@ -66,6 +78,15 @@
- name => $::neutron::params::openswan_package,
+@@ -79,6 +91,15 @@ class neutron::agents::vpnaas (
+ }
}
}
+
--- a/components/ruby/puppet-modules/openstack-neutron/patches/05-l3agent.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/05-l3agent.patch Wed Sep 07 14:48:35 2016 -0700
@@ -1,17 +1,9 @@
In-house patch for Solaris L3 agent driver configuration variables.
This patch is not currently suitable for upstream contribution.
---- openstack-neutron-6.1.0/manifests/agents/l3.pp.orig 2016-04-21 08:23:04.952418874 -0700
-+++ openstack-neutron-6.1.0/manifests/agents/l3.pp 2016-04-21 08:23:19.798506700 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # == Class: neutron::agents::l3
- #
- # Installs and configures the Neutron L3 service
-@@ -99,6 +103,14 @@
+--- openstack-neutron-8.2.0/manifests/agents/l3.pp.orig 2016-08-07 11:31:04.742484834 -0700
++++ openstack-neutron-8.2.0/manifests/agents/l3.pp 2016-08-07 11:34:02.877745750 -0700
+@@ -87,6 +87,14 @@
# 'dvr_snat': enable DVR with centralized SNAT support (DVR for single-host, for testing only)
# Defaults to 'legacy'
#
@@ -26,13 +18,22 @@
# [*allow_automatic_l3agent_failover*]
# DEPRECATED: Has no effect in this class. Use the same parameter in neutron::server instead.
#
-@@ -161,6 +173,9 @@
- 'DEFAULT/enable_metadata_proxy': value => $enable_metadata_proxy;
- 'DEFAULT/router_delete_namespaces': value => $router_delete_namespaces;
+@@ -132,6 +141,8 @@ class neutron::agents::l3 (
+ $ha_vrrp_advert_int = '3',
+ $agent_mode = 'legacy',
+ $availability_zone = $::os_service_default,
++ $ra_confs = undef,
++ $allowing_forwarding = undef,
+ # DEPRECATED PARAMETERS
+ $allow_automatic_l3agent_failover = false,
+ $use_namespaces = $::os_service_default,
+@@ -179,6 +190,8 @@ class neutron::agents::l3 (
'DEFAULT/agent_mode': value => $agent_mode;
+ 'DEFAULT/network_device_mtu': value => $network_device_mtu;
+ 'DEFAULT/use_namespaces': value => $use_namespaces;
+ 'DEFAULT/ra_confs': value => $ra_confs;
-+ 'DEFAULT/allow_forwarding_between_networks':
-+ value => $allow_forwarding;
++ 'DEFAULT/allow_forwarding_between_networks':value => $allow_forwarding_between_networks;
+ 'AGENT/availability_zone': value => $availability_zone;
}
-
- if $network_device_mtu {
+
+
--- a/components/ruby/puppet-modules/openstack-neutron/patches/06-launchpad-1476680.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-Upstream patch to address
-https://bugs.launchpad.net/puppet-openstack/+bug/1476680
-
-This is fixed in 7.0.0 or newer releases of this module.
-
-
-From f4a0f2aa66bd04a930b02e2c2b3f9f0377a451e7 Mon Sep 17 00:00:00 2001
-From: Sergey Kolekonov <[email protected]>
-Date: Tue, 21 Jul 2015 19:17:20 +0300
-Subject: [PATCH] Fix 'shared' parameter check in neutron_network provider
-
-Use stricter check for 'shared' parameter
-
-Change-Id: I36149b42943238dc342f8c6e71c1261f00e01c4a
-Closes-bug: #1476680
-
---- openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb.orig 2016-04-21 08:24:23.864059475 -0700
-+++ openstack-neutron-6.1.0/lib/puppet/provider/neutron_network/neutron.rb 2016-04-21 08:25:01.467129260 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- require File.join(File.dirname(__FILE__), '..','..','..',
- 'puppet/provider/neutron')
-
-@@ -53,7 +57,7 @@
- def create
- network_opts = Array.new
-
-- if @resource[:shared]
-+ if @resource[:shared] =~ /true/i
- network_opts << '--shared'
- end
-
---- openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb.orig 2016-04-21 08:24:29.372659168 -0700
-+++ openstack-neutron-6.1.0/spec/unit/provider/neutron_network/neutron_spec.rb 2016-04-21 08:25:06.247381103 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- require 'puppet'
- require 'spec_helper'
- require 'puppet/provider/neutron_network/neutron'
-@@ -31,7 +35,33 @@
-
- shared_examples 'neutron_network' do
-
-- describe 'when creating a network' do
-+ describe 'when creating a non-shared network' do
-+
-+ it 'should call net-create with appropriate command line options' do
-+ provider.class.stubs(:get_tenant_id).returns(net_attrs[:tenant_id])
-+
-+ output = 'Created a new network:
-+admin_state_up="True"
-+id="d9ac3494-20ea-406c-a4ba-145923dfadc9"
-+name="net1"
-+shared="False"
-+status="ACTIVE"
-+subnets=""
-+tenant_id="60f9544eb94c42a6b7e8e98c2be981b1"'
-+
-+ provider.expects(:auth_neutron).with('net-create',
-+ '--format=shell', ["--tenant_id=#{net_attrs[:tenant_id]}"],
-+ net_name).returns(output)
-+
-+ provider.create
-+ end
-+ end
-+
-+ describe 'when creating a shared network' do
-+
-+ let :local_attrs do
-+ attrs = net_attrs.merge({:shared => 'True'})
-+ end
-
- it 'should call net-create with appropriate command line options' do
- provider.class.stubs(:get_tenant_id).returns(net_attrs[:tenant_id])
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/07-ovs.patch Wed Sep 07 14:48:35 2016 -0700
@@ -0,0 +1,76 @@
+In-house patch to allow the ovs_server_package to also contain the ovs_agent.
+Currently not suitable for upstream, as it likely needs to take other scenarios
+into consideration.
+
+--- openstack-neutron-8.2.0/manifests/agents/ml2/ovs.pp.orig 2016-08-07 11:35:39.738189495 -0700
++++ openstack-neutron-8.2.0/manifests/agents/ml2/ovs.pp 2016-08-07 11:37:47.112203596 -0700
+@@ -191,6 +191,24 @@ class neutron::agents::ml2::ovs (
+ fail('A value of $ovsdb_interface is incorrect. The allowed values are vsctl and native')
+ }
+
++ # If there's a separate ovs_agent_package, instantiate it.
++ # Otherwise, use the ovs_server_package and ensure it's
++ # instantiated.
++ if ( $::neutron::params::ovs_agent_package ) {
++ $ovs_agent_package = $::neutron::params::ovs_agent_package
++ } else {
++ $ovs_agent_package = $::neutron::params::ovs_server_package
++ }
++
++ if ! defined(Package[$ovs_agent_package]) {
++ package { $ovs_agent_package:
++ ensure => $package_ensure,
++ name => $ovs_agent_package,
++ tag => 'openstack',
++ }
++ }
++
++ Package[$ovs_agent_package] -> Neutron_agent_ovs<||>
+ Neutron_agent_ovs<||> ~> Service['neutron-ovs-agent-service']
+
+ if ($bridge_mappings != []) {
+@@ -273,26 +291,6 @@ class neutron::agents::ml2::ovs (
+ }
+ }
+
+-
+- if $::neutron::params::ovs_agent_package {
+- package { 'neutron-ovs-agent':
+- ensure => $package_ensure,
+- name => $::neutron::params::ovs_agent_package,
+- tag => ['openstack', 'neutron-package'],
+- }
+- } else {
+- # Some platforms (RedHat) do not provide a separate
+- # neutron plugin ovs agent package. The configuration file for
+- # the ovs agent is provided by the neutron ovs plugin package.
+- if ! defined(Package['neutron-ovs-agent']) {
+- package { 'neutron-ovs-agent':
+- ensure => $package_ensure,
+- name => $::neutron::params::ovs_server_package,
+- tag => ['openstack', 'neutron-package'],
+- }
+- }
+- }
+-
+ if $manage_service {
+ if $enabled {
+ $service_ensure = 'running'
+@@ -300,7 +298,7 @@ class neutron::agents::ml2::ovs (
+ $service_ensure = 'stopped'
+ }
+ Package['neutron'] ~> Service['neutron-ovs-agent-service']
+- Package['neutron-ovs-agent'] ~> Service['neutron-ovs-agent-service']
++ Package[$ovs_agent_package] ~> Service['neutron-ovs-agent-service']
+ }
+
+ service { 'neutron-ovs-agent-service':
+@@ -312,7 +310,7 @@ class neutron::agents::ml2::ovs (
+ }
+
+ if $::neutron::params::ovs_cleanup_service {
+- Package['neutron-ovs-agent'] -> Service['ovs-cleanup-service']
++ Package[$ovs_agent_package] -> Service['ovs-cleanup-service']
+ service { 'ovs-cleanup-service':
+ name => $::neutron::params::ovs_cleanup_service,
+ enable => $enabled,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/08-gerrit-348007.patch Wed Sep 07 14:48:35 2016 -0700
@@ -0,0 +1,110 @@
+Upstream patch to move the definition of the :neutron command into the
+top-level provider. This patch will be in a future release of the
+module.
+
+Patch originates from:
+https://review.openstack.org/#/c/348007/
+
+From 8a85bb0860e334bced12c86771e4ef23c6731dc2 Mon Sep 17 00:00:00 2001
+From: Sofer Athlan-Guyot <[email protected]>
+Date: Wed, 27 Jul 2016 21:17:28 +0200
+Subject: [PATCH] Put neutron provider commands in neutron.rb
+
+This allows to gain access to all neutron commands using composability,
+see[1] for an example. It removes some redundancy as well. Finally, it
+looks more like the openstacklib/**/openstack.rb provider code.
+
+[1] https://review.openstack.org/#/c/347468/
+
+Change-Id: Iad0354f5babd86822e37053f3f7a1134803fd4f8
+---
+ lib/puppet/provider/neutron.rb | 3 +++
+ lib/puppet/provider/neutron_network/neutron.rb | 2 --
+ lib/puppet/provider/neutron_port/neutron.rb | 2 --
+ lib/puppet/provider/neutron_router/neutron.rb | 2 --
+ lib/puppet/provider/neutron_router_interface/neutron.rb | 2 --
+ lib/puppet/provider/neutron_subnet/neutron.rb | 2 --
+ 6 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/lib/puppet/provider/neutron.rb b/lib/puppet/provider/neutron.rb
+index b95b175..4b6cb18 100644
+--- a/lib/puppet/provider/neutron.rb
++++ b/lib/puppet/provider/neutron.rb
+@@ -3,6 +3,9 @@ require 'puppet/util/inifile'
+
+ class Puppet::Provider::Neutron < Puppet::Provider
+
++ initvars
++ commands :neutron => 'neutron'
++
+ def self.conf_filename
+ '/etc/neutron/neutron.conf'
+ end
+diff --git a/lib/puppet/provider/neutron_network/neutron.rb b/lib/puppet/provider/neutron_network/neutron.rb
+index a0addd3..c2a78fa 100644
+--- a/lib/puppet/provider/neutron_network/neutron.rb
++++ b/lib/puppet/provider/neutron_network/neutron.rb
+@@ -11,8 +11,6 @@ Puppet::Type.type(:neutron_network).provide(
+ Assumes that the neutron service is configured on the same host.
+ EOT
+
+- commands :neutron => 'neutron'
+-
+ mk_resource_methods
+
+ def self.neutron_type
+diff --git a/lib/puppet/provider/neutron_port/neutron.rb b/lib/puppet/provider/neutron_port/neutron.rb
+index 5aae227..67b0a6d 100644
+--- a/lib/puppet/provider/neutron_port/neutron.rb
++++ b/lib/puppet/provider/neutron_port/neutron.rb
+@@ -12,8 +12,6 @@ Puppet::Type.type(:neutron_port).provide(
+ EOT
+ #TODO No security group support
+
+- commands :neutron => "neutron"
+-
+ mk_resource_methods
+
+ def self.instances
+diff --git a/lib/puppet/provider/neutron_router/neutron.rb b/lib/puppet/provider/neutron_router/neutron.rb
+index 0fc3e5c..074db97 100644
+--- a/lib/puppet/provider/neutron_router/neutron.rb
++++ b/lib/puppet/provider/neutron_router/neutron.rb
+@@ -11,8 +11,6 @@ Puppet::Type.type(:neutron_router).provide(
+ Assumes that the neutron service is configured on the same host.
+ EOT
+
+- commands :neutron => 'neutron'
+-
+ mk_resource_methods
+
+ def self.do_not_manage
+diff --git a/lib/puppet/provider/neutron_router_interface/neutron.rb b/lib/puppet/provider/neutron_router_interface/neutron.rb
+index e9b541a..cc3bb71 100644
+--- a/lib/puppet/provider/neutron_router_interface/neutron.rb
++++ b/lib/puppet/provider/neutron_router_interface/neutron.rb
+@@ -17,8 +17,6 @@ Puppet::Type.type(:neutron_router_interface).provide(
+
+ EOT
+
+- commands :neutron => 'neutron'
+-
+ mk_resource_methods
+
+ def self.instances
+diff --git a/lib/puppet/provider/neutron_subnet/neutron.rb b/lib/puppet/provider/neutron_subnet/neutron.rb
+index 01f6371..b2daad8 100644
+--- a/lib/puppet/provider/neutron_subnet/neutron.rb
++++ b/lib/puppet/provider/neutron_subnet/neutron.rb
+@@ -12,8 +12,6 @@ Puppet::Type.type(:neutron_subnet).provide(
+ Assumes that the neutron service is configured on the same host.
+ EOT
+
+- commands :neutron => 'neutron'
+-
+ mk_resource_methods
+
+ def self.neutron_type
+--
+1.9.1
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/09-gerrit-347468.patch Wed Sep 07 14:48:35 2016 -0700
@@ -0,0 +1,116 @@
+Upstream patch to add the transform_to getter/setter and to/from_uuid
+methods. This patch has been modified from upstream to work with the
+Mitaka version of the module. This patch will be in a future release
+of the module.
+
+https://review.openstack.org/#/c/347468/
+
+From 80eaa471c96fb1df690ffe2e2ea5505b8287fdda Mon Sep 17 00:00:00 2001
+From: Sofer Athlan-Guyot <[email protected]>
+Date: Tue, 26 Jul 2016 17:59:52 +0200
+Subject: [PATCH] Transform name to uuid.
+
+Change-Id: I24553f79bdf64cf8a1c5c43572cff835591f9275
+Co-Authored-By: Drew Fisher <[email protected]>
+Depends-on: I3b7c17590b27cd3a22c5458342d049969ade2281
+Depends-on: Iad0354f5babd86822e37053f3f7a1134803fd4f8
+---
+ examples/neutron_l3_with_to_uuid.pp | 31 ++++++++++++++++++++++
+ .../neutron_l3_agent_config/ini_setting.rb | 14 ++++++++++
+ lib/puppet/type/neutron_l3_agent_config.rb | 2 ++
+ releasenotes/notes/add_name_to_uuid_transform.yaml | 4 +++
+ 4 files changed, 51 insertions(+)
+ create mode 100644 examples/neutron_l3_with_to_uuid.pp
+ create mode 100644 releasenotes/notes/add_name_to_uuid_transform.yaml
+
+diff --git a/examples/neutron_l3_with_to_uuid.pp b/examples/neutron_l3_with_to_uuid.pp
+new file mode 100644
+index 0000000..892e348
+--- /dev/null
++++ b/examples/neutron_l3_with_to_uuid.pp
+@@ -0,0 +1,31 @@
++#
++# This manifest is intended to demonstrate the 'transform_to' argument
++# for converting the name of a Neutron router to its UUID for
++# inclusion in l3-agent.ini
++#
++# This manifest extends the one shown in base_provision.pp
++#
++
++class { '::neutron':
++ allow_overlapping_ips => true,
++ rabbit_password => 'password',
++ rabbit_user => 'guest',
++ rabbit_host => 'localhost',
++ service_plugins => ['router']
++}
++
++class { '::neutron::server':
++ auth_password => 'password',
++ database_connection => 'mysql://neutron:[email protected]/neutron',
++}
++
++# configure l3-agent to use the new router by name
++class { '::neutron::agents::l3':
++ enabled => true,
++ use_namespaces => false,
++ require => Neutron_router['demo_router'],
++}
++
++neutron_l3_agent_config {
++ 'DEFAULT/router_id': value => 'demo_router', transform_to => 'uuid';
++}
+diff --git a/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb b/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb
+index 5bb2dfc..d36fd51 100644
+--- a/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb
++++ b/lib/puppet/provider/neutron_l3_agent_config/ini_setting.rb
+@@ -1,3 +1,5 @@
++require 'puppet/provider/neutron'
++
+ Puppet::Type.type(:neutron_l3_agent_config).provide(
+ :ini_setting,
+ :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
+@@ -7,4 +9,16 @@ Puppet::Type.type(:neutron_l3_agent_conf
+ '/etc/neutron/l3_agent.ini'
+ end
+
++ def to_uuid(name)
++ neutron = Puppet::Provider::Neutron.new
++ neutron.auth_neutron('router-show', "#{name}",
++ '--format=value', '--column=id').chop
++ end
++
++ def from_uuid(uuid)
++ neutron = Puppet::Provider::Neutron.new
++ neutron.auth_neutron('router-show', "#{uuid}",
++ '--format=value', '--column=name').chop
++ end
++
+ end
+diff --git a/lib/puppet/type/neutron_l3_agent_config.rb b/lib/puppet/type/neutron_l3_agent_config.rb
+index 569350f..a1569c5 100644
+--- a/lib/puppet/type/neutron_l3_agent_config.rb
++++ b/lib/puppet/type/neutron_l3_agent_config.rb
+@@ -21,6 +21,8 @@ Puppet::Type.newtype(:neutron_l3_agent_config) do
+ defaultto('<SERVICE DEFAULT>')
+ end
+
++ newparam(:transform_to)
++
+ autorequire(:package) do
+ 'neutron'
+ end
+diff --git a/releasenotes/notes/add_name_to_uuid_transform.yaml b/releasenotes/notes/add_name_to_uuid_transform.yaml
+new file mode 100644
+index 0000000..34cd794
+--- /dev/null
++++ b/releasenotes/notes/add_name_to_uuid_transform.yaml
+@@ -0,0 +1,4 @@
++---
++features:
++ - Add the ability to specify the a name string for the router_id in
++ neutron_l3_agent_config using the transform_to argument.
+--
+1.9.1
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-neutron/patches/10-remove-router-id.patch Wed Sep 07 14:48:35 2016 -0700
@@ -0,0 +1,35 @@
+In-house patch to remove the router_id option from configuration of
+l3-agent. A similar patch has been already merged upstream and can be
+found here:
+
+https://review.openstack.org/#/c/340639/
+
+--- openstack-neutron-8.0.1/manifests/agents/l3.pp.orig 2016-08-02 14:15:50.741614903 -0700
++++ openstack-neutron-8.0.1/manifests/agents/l3.pp 2016-08-02 14:16:08.531341208 -0700
+@@ -26,10 +26,6 @@
+ # (optional) Driver to interface with neutron
+ # Defaults to OVSInterfaceDriver
+ #
+-# [*router_id*]
+-# (optional) The ID of the external router in neutron
+-# Defaults to $::os_service_default
+-#
+ # [*gateway_external_network_id*]
+ # (optional) The ID of the external network in neutron
+ # Defaults to $::os_service_default
+@@ -125,7 +121,6 @@ class neutron::agents::l3 (
+ $manage_service = true,
+ $debug = false,
+ $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
+- $router_id = $::os_service_default,
+ $gateway_external_network_id = $::os_service_default,
+ $handle_internal_only_routers = $::os_service_default,
+ $metadata_port = $::os_service_default,
+@@ -178,7 +173,6 @@ class neutron::agents::l3 (
+ 'DEFAULT/debug': value => $debug;
+ 'DEFAULT/external_network_bridge': value => $external_network_bridge;
+ 'DEFAULT/interface_driver': value => $interface_driver;
+- 'DEFAULT/router_id': value => $router_id;
+ 'DEFAULT/gateway_external_network_id': value => $gateway_external_network_id;
+ 'DEFAULT/handle_internal_only_routers': value => $handle_internal_only_routers;
+ 'DEFAULT/metadata_port': value => $metadata_port;
--- a/components/ruby/puppet-modules/openstack-nova/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-nova
-COMPONENT_VERSION= 6.1.0
+COMPONENT_VERSION= 8.2.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)
+ sha256:362dd2597e819f16e9f23dff5779e5480554bd58c6f8511bd4fa397bd7723f82
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-nova/puppet-nova-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/nova
-TPNO= 25377
+TPNO= 30881
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/openstack-nova/files/solaris_zones.pp Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/files/solaris_zones.pp Wed Sep 07 14:48:35 2016 -0700
@@ -7,7 +7,7 @@
#
# [*glancecache_dirname*]
# (optional) Default path to local image cache.
-# Defaults to $state_path/images
+# Defaults to /var/share/nova/images
#
# [*solariszones_snapshots_directory*]
# (optional) Location where solariszones driver will store instance
@@ -15,16 +15,16 @@
# Defaults to $instances_path/snapshots
#
class nova::compute::solaris_zones(
- $glancecache_dirname='$state_path/images',
+ $glancecache_dirname='/var/share/nova/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';
+ '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';
+ 'solariszones/glancecache_dirname': value => $glancecache_dirname;
+ 'solariszones/solariszones_snapshots_directory': value => $solariszones_snapshots_directory;
}
}
--- a/components/ruby/puppet-modules/openstack-nova/openstack-nova.p5m Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/openstack-nova.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -45,21 +45,28 @@
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/examples/nova_wsgi.pp
+file path=etc/puppet/modules/nova/lib/facter/libvirt_uuid.rb
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_network/nova.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/provider/nova_security_group/nova.rb
+file path=etc/puppet/modules/nova/lib/puppet/provider/nova_security_rule/nova.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/lib/puppet/type/nova_security_group.rb
+file path=etc/puppet/modules/nova/lib/puppet/type/nova_security_rule.rb
file path=etc/puppet/modules/nova/manifests/api.pp
+file path=etc/puppet/modules/nova/manifests/availability_zone.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
@@ -80,9 +87,15 @@
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/mysql_api.pp
file path=etc/puppet/modules/nova/manifests/db/postgresql.pp
+file path=etc/puppet/modules/nova/manifests/db/postgresql_api.pp
+file path=etc/puppet/modules/nova/manifests/db/sync.pp
+file path=etc/puppet/modules/nova/manifests/db/sync_api.pp
+file path=etc/puppet/modules/nova/manifests/deps.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/ironic/common.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
@@ -108,13 +121,34 @@
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/manifests/wsgi/apache.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/releasenotes/notes/add_nova_api_db-62e459588e14a92e.yaml
+file path=etc/puppet/modules/nova/releasenotes/notes/deprecate_network_api_class-557e9ac007c97feb.yaml
+file path=etc/puppet/modules/nova/releasenotes/notes/keystone_v3_neutron-62f3f801039ddcc8.yaml
+file path=etc/puppet/modules/nova/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/nova/releasenotes/notes/mitaka_drepecations-704e9befd68c3c6d.yaml
+file path=etc/puppet/modules/nova/releasenotes/notes/mitaka_features-ddeb388524fa6590.yaml
+file path=etc/puppet/modules/nova/releasenotes/notes/nova_network_provider-10b28e14d9db08f0.yaml
+file path=etc/puppet/modules/nova/releasenotes/notes/pymysql-e57bf1f0289dd426.yaml
+file path=etc/puppet/modules/nova/releasenotes/notes/remove_qpid-0b446db43fdea617.yaml
+file path=etc/puppet/modules/nova/releasenotes/notes/security_group_provider-50c27926baa9e015.yaml
+file path=etc/puppet/modules/nova/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/nova/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/nova/releasenotes/source/conf.py
+file path=etc/puppet/modules/nova/releasenotes/source/index.rst
+file path=etc/puppet/modules/nova/releasenotes/source/mitaka.rst
+file path=etc/puppet/modules/nova/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/nova/setup.cfg
+file path=etc/puppet/modules/nova/setup.py
+file path=etc/puppet/modules/nova/spec/acceptance/nodesets/centos-70-x64.yml
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/acceptance/nova_wsgi_apache_spec.rb
file path=etc/puppet/modules/nova/spec/classes/nova_api_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_availability_zone_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
@@ -131,11 +165,16 @@
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_api_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_api_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_db_sync_api_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_db_sync_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_ironic_common_spec.rb
+file path=etc/puppet/modules/nova/spec/classes/nova_keystone_auth_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
@@ -145,7 +184,6 @@
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
@@ -154,19 +192,29 @@
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/classes/nova_wsgi_apache_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/type/nova_security_group_spec.rb
+file path=etc/puppet/modules/nova/spec/type/nova_security_rule_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_floating/nova_manage_spec.rb
+file path=etc/puppet/modules/nova/spec/unit/provider/nova_network/nova_spec.rb
+file path=etc/puppet/modules/nova/spec/unit/provider/nova_security_group/nova_spec.rb
+file path=etc/puppet/modules/nova/spec/unit/provider/nova_security_rule/nova_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/spec/unit/type/nova_security_group_spec.rb
+file path=etc/puppet/modules/nova/spec/unit/type/nova_security_rule_spec.rb
file path=etc/puppet/modules/nova/templates/secret.xml-compute.erb
+file path=etc/puppet/modules/nova/test-requirements.txt
+file path=etc/puppet/modules/nova/tox.ini
#
license openstack-nova.license license="Apache v2.0"
--- a/components/ruby/puppet-modules/openstack-nova/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,37 +2,25 @@
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
-@@ -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"},
-@@ -54,6 +52,13 @@
- "12.04",
+--- openstack-nova-8.2.0/metadata.json.orig 2016-08-07 11:50:24.365833250 -0700
++++ openstack-nova-8.2.0/metadata.json 2016-08-07 11:50:58.069311714 -0700
+@@ -29,12 +29,18 @@
+ "operatingsystemrelease": [
"14.04"
]
+ },
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
}
],
- "description": "Installs and configures OpenStack Nova (Compute)."
-
---- openstack-nova-6.1.0/README.md.orig 2016-04-27 12:14:40.022335012 -0700
-+++ openstack-nova-6.1.0/README.md 2016-04-27 12:14:49.534359893 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- nova
- ====
-
+ "description": "Installs and configures OpenStack Nova (Compute).",
+ "dependencies": [
+ {"name":"puppetlabs/apache","version_requirement":">=1.8.0 <2.0.0"},
+- {"name":"duritong/sysctl","version_requirement":">=0.0.1 <1.0.0"},
+ {"name":"openstack/cinder","version_requirement":">=8.2.0 <9.0.0"},
+ {"name":"openstack/glance","version_requirement":">=8.2.0 <9.0.0"},
+ {"name":"puppetlabs/inifile","version_requirement":">=1.4.0 <2.0.0"},
--- a/components/ruby/puppet-modules/openstack-nova/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,7 +12,23 @@
# == Class: nova::params
#
# These parameters need to be accessed from several locations and
-@@ -116,8 +120,39 @@
+@@ -30,6 +34,7 @@ class nova::params {
+ $pymysql_package_name = undef
+ $ceph_client_package_name = 'ceph-common'
+ $genisoimage_package_name = 'genisoimage'
++ $nova_client_package_name = 'python-novaclient'
+ # service names
+ $api_service_name = 'openstack-nova-api'
+ $cells_service_name = 'openstack-nova-cells'
+@@ -90,6 +95,7 @@ class nova::params {
+ $pymysql_package_name = 'python-pymysql'
+ $ceph_client_package_name = 'ceph'
+ $genisoimage_package_name = 'genisoimage'
++ $nova_client_package_name = 'python-novaclient'
+ # service names
+ $api_service_name = 'nova-api'
+ $cells_service_name = 'nova-cells'
+@@ -128,8 +134,41 @@ class nova::params {
}
}
}
@@ -33,6 +49,8 @@
+ $tgt_package_name = 'system/storage/iscsi/iscsi-target'
+ $vncproxy_package_name = 'cloud/openstack/nova'
+ $spicehtml5proxy_package_name = undef
++ $genisoimage_package_name = 'media/cdrtools'
++ $nova_client_package_name = 'library/python/novaclient'
+ # service names
+ $api_service_name = 'application/openstack/nova/nova-api-osapi-compute:default'
+ $cells_service_name = undef
@@ -49,7 +67,7 @@
+ }
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")
++ fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat, Debian, and Solaris")
}
}
-
+
--- a/components/ruby/puppet-modules/openstack-nova/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,51 +12,19 @@
# == Class: nova
#
# This class is used to specify configuration parameters that are common
-@@ -397,12 +401,6 @@
- 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 {
+@@ -511,15 +515,9 @@ class nova(
class { '::nova::utilities': }
}
-@@ -411,23 +409,14 @@
- # 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'],
+- ensure => $ensure_package,
+- tag => ['openstack', 'nova-package'],
- }
-
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'],
+- require => Package['python-nova'],
+ tag => ['openstack', 'nova-package'],
}
-
-@@ -576,9 +565,6 @@
- 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;}
+
--- a/components/ruby/puppet-modules/openstack-nova/patches/04-generic-service.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-nova/patches/04-generic-service.patch Wed Sep 07 14:48:35 2016 -0700
@@ -4,7 +4,6 @@
--- openstack-nova-6.1.0/manifests/generic_service.pp.orig 2016-04-21 08:29:00.221923911 -0700
+++ openstack-nova-6.1.0/manifests/generic_service.pp 2016-04-21 08:29:13.981164142 -0700
-@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
@@ -12,10 +11,10 @@
# == Define: nova::generic_service
#
# This defined type implements basic nova services.
-@@ -79,7 +83,7 @@
+@@ -64,7 +68,7 @@ define nova::generic_service(
}
}
-
+
- service { $nova_title:
+ service { $service_name:
ensure => $service_ensure,
--- a/components/ruby/puppet-modules/openstack-nova/patches/05-api.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-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 2016-04-21 08:29:47.808392108 -0700
-+++ openstack-nova-6.1.0/manifests/api.pp 2016-04-21 08:30:04.868712046 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # == Class: nova::api
- #
- # Setup and configure the Nova API endpoint
-@@ -195,8 +199,8 @@
-
- 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/05-client.patch Wed Sep 07 14:48:35 2016 -0700
@@ -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-8.0.1/manifests/client.pp.orig 2016-07-08 12:57:08.610844762 -0700
++++ openstack-nova-8.0.1/manifests/client.pp 2016-07-08 13:01:57.491564771 -0700
+@@ -12,8 +12,9 @@ class nova::client(
+ $ensure = 'present'
+ ) {
+ include ::nova::deps
++ include ::nova::params
+
+- package { 'python-novaclient':
++ package { "$::nova::params::nova_client_package_name":
+ ensure => $ensure,
+ tag => ['openstack', 'nova-support-package'],
+ }
--- a/components/ruby/puppet-modules/openstack-nova/patches/06-compute.patch Wed Sep 07 14:48:35 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-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 2016-04-21 08:30:36.200699179 -0700
-+++ openstack-nova-6.1.0/manifests/compute.pp 2016-04-21 08:30:51.264416908 -0700
-@@ -1,3 +1,7 @@
-+#######################################################################
-+# Oracle has modified the originally distributed contents of this file.
-+#######################################################################
-+
- # == Class: nova::compute
- #
- # Installs the nova-compute service
-@@ -207,10 +211,6 @@
- }
- }
-
-- package { 'pm-utils':
-- ensure => present,
-- }
--
- nova_config {
- 'DEFAULT/force_raw_images': value => $force_raw_images;
- }
--- a/components/ruby/puppet-modules/openstack-openstacklib/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-openstacklib/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-openstacklib
-COMPONENT_VERSION= 6.1.0
+COMPONENT_VERSION= 8.2.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)
+ sha256:e1a40a49340fdcfecad37c5ca7f34ab4879fb146009a1a27b111266bc0d4287d
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-openstacklib/puppet-openstacklib-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/nova
-TPNO= 25379
+TPNO= 30882
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/openstack-openstacklib/openstack-openstacklib.p5m Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-openstacklib/openstack-openstacklib.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -43,10 +43,20 @@
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/facts.d/os_service_default.txt
+file path=etc/puppet/modules/openstacklib/lib/facter/os_package_type.rb
+file path=etc/puppet/modules/openstacklib/lib/facter/os_service_default.rb
+file path=etc/puppet/modules/openstacklib/lib/puppet/parser/functions/is_service_default.rb
+file path=etc/puppet/modules/openstacklib/lib/puppet/parser/functions/normalize_ip_for_uri.rb
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/lib/puppet/provider/openstack_config/ini_setting.rb
+file path=etc/puppet/modules/openstacklib/lib/puppet/provider/openstack_config/ruby.rb
+file path=etc/puppet/modules/openstacklib/lib/puppet/type/openstack_config.rb
+file path=etc/puppet/modules/openstacklib/lib/puppet/util/openstackconfig.rb
+file path=etc/puppet/modules/openstacklib/lib/puppet/util/openstackconfig/section.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
@@ -54,16 +64,36 @@
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/policyrcd.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/releasenotes/notes/catch_403-237b79f33ab3364f.yaml
+file path=etc/puppet/modules/openstacklib/releasenotes/notes/feature_add_exclusion_to_retry_mechanism-2acb52fa25bd315c.yaml
+file path=etc/puppet/modules/openstacklib/releasenotes/notes/ipv6_brackets-7a453aea5e091855.yaml
+file path=etc/puppet/modules/openstacklib/releasenotes/notes/manage_policy_rc_d_file-747510db06792d52.yaml
+file path=etc/puppet/modules/openstacklib/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/openstacklib/releasenotes/notes/more_db_options-d96316ae4eb5a78c.yaml
+file path=etc/puppet/modules/openstacklib/releasenotes/notes/retry_client-b8a0e1f9ff679281.yaml
+file path=etc/puppet/modules/openstacklib/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/openstacklib/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/openstacklib/releasenotes/source/conf.py
+file path=etc/puppet/modules/openstacklib/releasenotes/source/index.rst
+file path=etc/puppet/modules/openstacklib/releasenotes/source/mitaka.rst
+file path=etc/puppet/modules/openstacklib/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/openstacklib/setup.cfg
+file path=etc/puppet/modules/openstacklib/setup.py
file path=etc/puppet/modules/openstacklib/spec/acceptance/mysql_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/acceptance/nodesets/centos-70-x64.yml
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/nodesets/ubuntu-server-1404-x64.yml
+file path=etc/puppet/modules/openstacklib/spec/acceptance/openstacklib_config_provider_spec.rb
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/classes/openstacklib_policyrcd_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
@@ -71,13 +101,20 @@
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/is_service_default_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/functions/normalize_ip_for_uri_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_config/ini_setting_spec.rb
file path=etc/puppet/modules/openstacklib/spec/unit/provider/openstack_spec.rb
+file path=etc/puppet/modules/openstacklib/spec/unit/puppet/util/openstackconfig_spec.rb
+file path=etc/puppet/modules/openstacklib/templates/policy-rc.d.erb
+file path=etc/puppet/modules/openstacklib/test-requirements.txt
+file path=etc/puppet/modules/openstacklib/tox.ini
#
license openstack-openstacklib.license license="Apache v2.0"
--- a/components/ruby/puppet-modules/openstack-openstacklib/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-openstacklib/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,38 +2,29 @@
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
-@@ -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": [
- {
-@@ -50,6 +49,13 @@
- "12.04",
+--- openstack-openstacklib-8.2.0/metadata.json.orig 2016-08-07 12:05:21.251224531 -0700
++++ openstack-openstacklib-8.2.0/metadata.json 2016-08-07 12:05:59.016560234 -0700
+@@ -29,6 +29,13 @@
+ "operatingsystemrelease": [
"14.04"
]
+ },
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
}
],
- "description": "Puppet module library to expose common functionality between OpenStack modules."
+ "description": "Puppet module library to expose common functionality between OpenStack modules.",
+@@ -37,7 +44,6 @@
+ {"name":"puppetlabs/inifile","version_requirement":">=1.4.0 <2.0.0"},
+ {"name":"puppetlabs/mysql","version_requirement":">=3.6.0 <4.0.0"},
+ {"name":"puppetlabs/stdlib","version_requirement":">=4.9.0 <5.0.0"},
+- {"name":"puppetlabs/rabbitmq","version_requirement":">=5.3.1 <6.0.0"},
+- {"name":"puppetlabs/postgresql","version_requirement":">=4.6.0 <5.0.0"}
++ {"name":"puppetlabs/rabbitmq","version_requirement":">=5.3.1 <6.0.0"}
+ ]
+ }
---- openstack-openstacklib-6.1.0/README.md.orig 2016-04-27 12:15:45.286079312 -0700
-+++ openstack-openstacklib-6.1.0/README.md 2016-04-27 12:15:54.419984548 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- openstacklib
- ============
-
--- a/components/ruby/puppet-modules/openstack-openstacklib/patches/02-openstackclient.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-openstacklib/patches/02-openstackclient.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,24 +12,14 @@
# == Class: openstacklib::openstackclient
#
# Installs the openstackclient
-@@ -10,9 +14,16 @@
- #
+@@ -11,5 +15,9 @@
class openstacklib::openstackclient(
$package_ensure = 'present',
--){
-- package { 'python-openstackclient':
-- ensure => $package_ensure,
-- tag => 'openstack',
-+) {
+ ){
+- ensure_packages('python-openstackclient', {'ensure' => $package_ensure, tag => 'openstack'})
+ if $::osfamily == 'Solaris' {
-+ package { 'library/python/openstackclient':
-+ ensure => $package_ensure,
-+ tag => 'openstack',
-+ }
++ ensure_packages('library/python/openstackclient', {'ensure' => $package_ensure, tag => 'openstack'})
+ } else {
-+ package { 'python-openstackclient':
-+ ensure => $package_ensure,
-+ tag => 'openstack',
-+ }
- }
++ ensure_packages('python-openstackclient', {'ensure' => $package_ensure, tag => 'openstack'})
++ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ruby/puppet-modules/openstack-openstacklib/patches/03-gerrit-347463.patch Wed Sep 07 14:48:35 2016 -0700
@@ -0,0 +1,197 @@
+Upstream patch to provide support for value transforms. This patch
+will be in a future release of the module.
+
+https://review.openstack.org/#/c/347463/
+
+From 2075930b90d54e13e6cc9cd1ba65d1f326a409a9 Mon Sep 17 00:00:00 2001
+From: Sofer Athlan-Guyot <[email protected]>
+Date: Tue, 26 Jul 2016 17:54:07 +0200
+Subject: [PATCH] Add a way for provider to transform value in config.
+
+For instance this would enable this:
+
+ neutron_l3_agent_config {
+ 'DEFAULT/router_id': value => $router_name, transform_to => 'uuid';
+ }
+
+The neutron_l3_agent_config would only have to implement this:
+
+ def to_uuid(name)
+ # code to get the uuid
+ end
+
+ def from_uuid(uuid)
+ # code to return the name
+ end
+
+Change-Id: I3b7c17590b27cd3a22c5458342d049969ade2281
+Co-Authored-By: Drew Fisher <[email protected]>
+---
+ .../provider/openstack_config/ini_setting.rb | 40 +++++++++++++++++++
+ .../notes/feature_add_transform_for_config.yaml | 5 +++
+ .../provider/openstack_config/ini_setting_spec.rb | 46 +++++++++++++++++++++-
+ 3 files changed, 90 insertions(+), 1 deletion(-)
+ create mode 100644 releasenotes/notes/feature_add_transform_for_config.yaml
+
+diff --git a/lib/puppet/provider/openstack_config/ini_setting.rb b/lib/puppet/provider/openstack_config/ini_setting.rb
+index 4a3265f..c96546d 100644
+--- a/lib/puppet/provider/openstack_config/ini_setting.rb
++++ b/lib/puppet/provider/openstack_config/ini_setting.rb
+@@ -10,6 +10,11 @@ Puppet::Type.type(:openstack_config).provide(
+ super
+ end
+
++ def create
++ resource[:value] = transform(:to, resource[:value])
++ super
++ end
++
+ def section
+ resource[:name].split('/', 2).first
+ end
+@@ -18,10 +23,33 @@ Puppet::Type.type(:openstack_config).provide(
+ resource[:name].split('/', 2).last
+ end
+
++ def value=(value)
++ new_value = transform(:to, value)
++
++ ini_file.set_value(section, setting, new_value)
++ ini_file.save
++ end
++
++ def value
++ value = ini_file.get_value(section, setting)
++ new_value = transform(:from, value)
++ @property_hash[:value] = new_value
++ new_value
++ end
++
+ def ensure_absent_val
+ resource[:ensure_absent_val]
+ end
+
++ def transform_to
++ return nil unless resource.to_hash.has_key? :transform_to
++ resource[:transform_to]
++ end
++
++ def transform_to=(value)
++ @property_hash[:transform_to] = value
++ end
++
+ def separator
+ '='
+ end
+@@ -30,4 +58,16 @@ Puppet::Type.type(:openstack_config).provide(
+ self.class.file_path
+ end
+
++ def transform(direction, value)
++ new_value = value
++ if !transform_to.nil? && !transform_to.empty?
++ transformation_function = "#{direction}_#{transform_to}".to_sym
++ if self.respond_to?(transformation_function)
++ new_value = send(transformation_function, value)
++ else
++ error("Cannot find transformation #{transformation_function} for #{value}")
++ end
++ end
++ new_value
++ end
+ end
+diff --git a/releasenotes/notes/feature_add_transform_for_config.yaml b/releasenotes/notes/feature_add_transform_for_config.yaml
+new file mode 100644
+index 0000000..844023a
+--- /dev/null
++++ b/releasenotes/notes/feature_add_transform_for_config.yaml
+@@ -0,0 +1,5 @@
++---
++features:
++ - Add the ability to transform values in config files. This allows
++ operators to configure input directly at assignment by specifying
++ a 'transform_to' attribute.
+diff --git a/spec/unit/provider/openstack_config/ini_setting_spec.rb b/spec/unit/provider/openstack_config/ini_setting_spec.rb
+index 128ecd1..33a9645 100644
+--- a/spec/unit/provider/openstack_config/ini_setting_spec.rb
++++ b/spec/unit/provider/openstack_config/ini_setting_spec.rb
+@@ -20,13 +20,23 @@ describe provider_class do
+
+ let(:properties) do
+ {
+- :name => 'DEFAUL/foo',
++ :name => 'DEFAULT/foo',
+ :value => 'bar',
+ :ensure_absent_val => 'some_value',
+ :ensure => :present,
+ }
+ end
+
++ let(:transform_properties) do
++ {
++ :name => 'DEFAULT/foo',
++ :value => 'bar',
++ :transform_to => 'upper',
++ :ensure_absent_val => 'some_value',
++ :ensure => :present,
++ }
++ end
++
+ let(:type) do
+ Puppet::Type.newtype(:test_config) do
+ newparam(:name, :namevar => true)
+@@ -36,11 +46,26 @@ describe provider_class do
+ end
+ end
+
++ let(:transform_type) do
++ Puppet::Type.newtype(:test_config) do
++ newparam(:name, :namevar => true)
++ newparam(:ensure)
++ newproperty(:value)
++ newparam(:ensure_absent_val)
++ newparam(:transform_to)
++ end
++ end
++
+ let(:resource) do
+ resource = type.new(properties)
+ resource
+ end
+
++ let(:transform_resource) do
++ resource = transform_type.new(transform_properties)
++ resource
++ end
++
+ context '#exists?' do
+ it 'ensure to present' do
+ child_conf = Class.new(provider_class) do
+@@ -66,4 +91,23 @@ describe provider_class do
+ end
+ end
+
++ context 'transform_to' do
++ it 'transforms a property' do
++ child_conf = Class.new(provider_class) do
++ def self.file_path
++ '/some/file/path'
++ end
++
++ def to_upper(value)
++ value.upcase!
++ end
++ end
++ provider = child_conf.new(transform_resource)
++ provider.exists?
++ provider.transform(:to, transform_resource[:value])
++ expect(transform_resource[:value]).to eq 'BAR'
++ end
++
++ end
++
+ end
+--
+1.9.1
+
+
--- a/components/ruby/puppet-modules/openstack-swift/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -20,22 +20,22 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-swift
-COMPONENT_VERSION= 6.1.0
+COMPONENT_VERSION= 8.2.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)
+ sha256:ac976c04a12c8d56c688161b2f68f5a180316cbd80cf739b952f5c437f00774a
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-swift/puppet-swift-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/swift
-TPNO= 25378
+TPNO= 30883
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk
--- a/components/ruby/puppet-modules/openstack-swift/openstack-swift.p5m Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/openstack-swift.p5m Wed Sep 07 14:48:35 2016 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -46,20 +46,19 @@
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/service/swiftinit.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_container_sync_realms_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_object_expirer_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
@@ -69,16 +68,20 @@
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_container_sync_realms_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_object_expirer_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/config.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/objectexpirer.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
@@ -88,7 +91,9 @@
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/container_sync.pp
file path=etc/puppet/modules/swift/manifests/proxy/crossdomain.pp
+file path=etc/puppet/modules/swift/manifests/proxy/dlo.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
@@ -107,6 +112,7 @@
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/service.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
@@ -125,15 +131,32 @@
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/releasenotes/notes/container_sync-5869bca433355047.yaml
+file path=etc/puppet/modules/swift/releasenotes/notes/mitaka-dece9d43a565e6cb.yaml
+file path=etc/puppet/modules/swift/releasenotes/notes/mitaka_deprecation-3344541c884cfed8.yaml
+file path=etc/puppet/modules/swift/releasenotes/notes/mitaka_features-52ecf51429531fbb.yaml
+file path=etc/puppet/modules/swift/releasenotes/notes/use-reno-1caaec4ba5aa4285.yaml
+file path=etc/puppet/modules/swift/releasenotes/source/_static/.placeholder
+file path=etc/puppet/modules/swift/releasenotes/source/conf.py
+file path=etc/puppet/modules/swift/releasenotes/source/index.rst
+file path=etc/puppet/modules/swift/releasenotes/source/mitaka.rst
+file path=etc/puppet/modules/swift/releasenotes/source/unreleased.rst
+file path=etc/puppet/modules/swift/setup.cfg
+file path=etc/puppet/modules/swift/setup.py
file path=etc/puppet/modules/swift/spec/acceptance/basic_swift_spec.rb
+file path=etc/puppet/modules/swift/spec/acceptance/nodesets/centos-70-x64.yml
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/acceptance/nodesets/ubuntu-server-1404-x64.yml
+file path=etc/puppet/modules/swift/spec/acceptance/swift_config_spec.rb
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_config_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_objectexpirer_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
@@ -141,7 +164,9 @@
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_container_sync_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_dlo_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
@@ -153,6 +178,7 @@
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_tempauth_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
@@ -179,10 +205,29 @@
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/provider/swift_account_config/ini_setting_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/provider/swift_bench_config/ini_setting_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/provider/swift_config/ini_setting_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/provider/swift_container_config/ini_setting_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/provider/swift_container_sync_realms_config/ini_setting_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/provider/swift_dispersion_config/ini_setting_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/provider/swift_object_config/ini_setting_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/provider/swift_object_expirer_config/ini_setting_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/provider/swift_proxy_config/ini_setting_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/puppet/provider/service/swiftinit_spec.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/spec/unit/type/swift_account_config_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/type/swift_bench_config_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/type/swift_config_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/type/swift_container_config_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/type/swift_container_sync_realms_config.rb
+file path=etc/puppet/modules/swift/spec/unit/type/swift_dispersion_config_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/type/swift_object_config_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/type/swift_object_expirer_config_spec.rb
+file path=etc/puppet/modules/swift/spec/unit/type/swift_proxy_config_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
@@ -194,7 +239,9 @@
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/container_sync.conf.erb
file path=etc/puppet/modules/swift/templates/proxy/crossdomain.conf.erb
+file path=etc/puppet/modules/swift/templates/proxy/dlo.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
@@ -211,8 +258,10 @@
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/test-requirements.txt
file path=etc/puppet/modules/swift/tests/all.pp
file path=etc/puppet/modules/swift/tests/site.pp
+file path=etc/puppet/modules/swift/tox.ini
#
license openstack-swift.license license="Apache v2.0"
@@ -233,3 +282,4 @@
# force a dependency on saz-memcached
depend type=require fmri=system/management/puppet/saz-memcached
+
--- a/components/ruby/puppet-modules/openstack-swift/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/01-metadata.patch Wed Sep 07 14:48:35 2016 -0700
@@ -2,36 +2,28 @@
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
-@@ -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"}
- ],
-@@ -52,6 +51,13 @@
- "12.04",
+--- openstack-swift-8.2.0/metadata.json.orig 2016-08-07 11:59:25.994025539 -0700
++++ openstack-swift-8.2.0/metadata.json 2016-08-07 12:00:06.468809139 -0700
+@@ -29,6 +29,13 @@
+ "operatingsystemrelease": [
"14.04"
]
+ },
+ {
+ "operatingsystem": "Solaris",
+ "operatingsystemrelease": [
-+ "11.3",
-+ "12.0"
++ "12.0",
++ "11.3"
+ ]
}
],
- "description": "Installs and configures OpenStack Swift (Object Storage)."
+ "description": "Installs and configures OpenStack Swift (Object Storage).",
+@@ -37,7 +44,6 @@
+ {"name":"openstack/keystone","version_requirement":">=8.2.0 <9.0.0"},
+ {"name":"puppetlabs/rsync","version_requirement":">=0.4.0 <1.0.0"},
+ {"name":"puppetlabs/stdlib","version_requirement":">=4.9.0 <5.0.0"},
+- {"name":"puppetlabs/xinetd","version_requirement":">=1.5.0 <2.0.0"},
+ {"name":"puppetlabs/concat","version_requirement":">=1.2.0 <2.0.0"},
+ {"name":"saz/memcached","version_requirement":">=2.8.1 <3.0.0"}
+ ]
---- openstack-swift-6.1.0/README.md.orig 2016-04-27 12:16:38.368953504 -0700
-+++ openstack-swift-6.1.0/README.md 2016-04-27 12:16:47.335339012 -0700
-@@ -1,3 +1,5 @@
-+NOTE: Oracle has modified the originally distributed contents of metadata.json.
-+
- swift
- =======
-
--- a/components/ruby/puppet-modules/openstack-swift/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/02-params.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,7 +12,7 @@
# == Class: swift::params
#
class swift::params {
-@@ -52,6 +56,29 @@
+@@ -58,6 +62,29 @@ class swift::params {
$service_provider = undef
$swift3 = 'openstack-swift-plugin-swift3'
}
--- a/components/ruby/puppet-modules/openstack-swift/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/03-init.patch Wed Sep 07 14:48:35 2016 -0700
@@ -4,7 +4,7 @@
--- openstack-swift-6.1.0/manifests/init.pp.orig 2016-04-21 09:04:49.670248833 -0700
+++ openstack-swift-6.1.0/manifests/init.pp 2016-04-21 09:05:19.849256812 -0700
-@@ -1,7 +1,15 @@
+@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
@@ -12,49 +12,31 @@
# Install and configure base swift components
#
# == 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.
-@@ -29,6 +37,7 @@
- # Copyright 2011 Puppetlabs Inc, unless otherwise noted.
- #
- class swift(
-+ $swift_hash_prefix,
- $swift_hash_suffix,
- $package_ensure = 'present',
- $client_package_ensure = 'present',
-@@ -49,27 +58,9 @@
+@@ -85,27 +89,6 @@ 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,
+- ensure => present,
+- require => Package['swift'],
- }
- file { '/var/lib/swift':
- ensure => directory,
- }
- file { '/var/run/swift':
-- ensure => directory,
+- ensure => directory,
+- selinux_ignore_defaults => true,
- }
-
- 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,
- }
+ File['/etc/swift/swift.conf'] -> Swift_config<||>
+
+ swift_config {
--- a/components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/04-proxy.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,14 +12,14 @@
#
# TODO - assumes that proxy server is always a memcached server
#
-@@ -167,17 +171,20 @@
+@@ -173,16 +177,19 @@ class swift::proxy(
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',
+- tag => ['openstack', 'swift-package'],
+ if ( $swift::params::proxy_package_name != $swift::params::package_name ) {
+ ensure_packages([$swift::params::proxy_package_name],
+ {
@@ -29,12 +29,11 @@
+ }
+ )
}
-
+
concat { '/etc/swift/proxy-server.conf':
owner => 'swift',
group => 'swift',
- mode => '0660',
- require => Package['swift-proxy'],
}
-
+
$required_classes = split(
--- a/components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,10 +12,10 @@
# == Class: swift::ringserver
#
# Used to create an rsync server to serve up the ring databases via rsync
-@@ -32,20 +36,9 @@
-
+@@ -32,20 +36,9 @@ class swift::ringserver(
+
Class['swift::ringbuilder'] -> Class['swift::ringserver']
-
+
- if !defined(Class['rsync::server']) {
- class { '::rsync::server':
- use_xinetd => true,
@@ -36,6 +36,7 @@
- read_only => true,
- }
}
+
--- openstack-swift-6.1.0/manifests/storage.pp.orig 2016-04-21 08:35:49.421176646 -0700
+++ openstack-swift-6.1.0/manifests/storage.pp 2016-04-21 08:36:21.531668180 -0700
@@ -1,3 +1,7 @@
@@ -61,6 +62,7 @@
}
}
}
+
--- openstack-swift-6.1.0/manifests/storage/server.pp.orig 2016-04-21 08:35:54.242984740 -0700
+++ openstack-swift-6.1.0/manifests/storage/server.pp 2016-04-21 08:36:24.979535088 -0700
@@ -1,3 +1,7 @@
--- a/components/ruby/puppet-modules/openstack-swift/patches/06-storage.patch Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-swift/patches/06-storage.patch Wed Sep 07 14:48:35 2016 -0700
@@ -12,21 +12,15 @@
# Class swift::storage::account
#
# == Parameters
-@@ -43,7 +47,6 @@
- name => $::swift::params::account_reaper_service_name,
- enable => $enabled,
- provider => $::swift::params::service_provider,
-- require => Package['swift-account'],
- }
-
- service { 'swift-account-auditor':
-@@ -51,6 +54,5 @@
- name => $::swift::params::account_auditor_service_name,
- enable => $enabled,
- provider => $::swift::params::service_provider,
-- require => Package['swift-account'],
+@@ -58,7 +62,6 @@ class swift::storage::account(
+ enabled => $enabled,
+ config_file_name => $config_file_name,
+ service_provider => $service_provider,
+- require => Package['swift-account'],
+ subscribe => File["/etc/swift/${config_file_name}"],
}
}
+
--- openstack-swift-6.1.0/manifests/storage/container.pp.orig 2016-04-21 08:41:03.411182222 -0700
+++ openstack-swift-6.1.0/manifests/storage/container.pp 2016-04-21 08:41:41.863686954 -0700
@@ -1,3 +1,7 @@
@@ -34,28 +28,28 @@
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
+
+ # Class swift::storage::container
#
# === Parameters
- #
-@@ -48,7 +52,6 @@
- name => $::swift::params::container_updater_service_name,
- enable => $enabled,
- provider => $::swift::params::service_provider,
-- require => Package['swift-container'],
+@@ -64,7 +68,6 @@ class swift::storage::container(
+ enabled => $enabled,
+ config_file_name => $config_file_name,
+ service_provider => $service_provider,
+- require => Package['swift-container'],
+ subscribe => File["/etc/swift/${config_file_name}"],
}
-
- service { 'swift-container-auditor':
-@@ -56,7 +59,6 @@
- name => $::swift::params::container_auditor_service_name,
- enable => $enabled,
- provider => $::swift::params::service_provider,
-- require => Package['swift-container'],
- }
-
- if $::operatingsystem == 'Ubuntu' {
+
+@@ -75,7 +78,6 @@ class swift::storage::container(
+ enabled => $enabled,
+ config_file_name => $config_file_name,
+ service_provider => $service_provider,
+- require => Package['swift-container'],
+ subscribe => File["/etc/swift/${config_file_name}"],
+ }
+ Swift_config<| |> ~> Service['swift-container-sync']
+
--- openstack-swift-6.1.0/manifests/storage/object.pp.orig 2016-04-21 08:41:08.181529232 -0700
+++ openstack-swift-6.1.0/manifests/storage/object.pp 2016-04-21 08:41:44.966394780 -0700
-@@ -1,3 +1,7 @@
+#######################################################################
+# Oracle has modified the originally distributed contents of this file.
+#######################################################################
@@ -63,21 +57,15 @@
# Class swift::storage::object
#
# == Parameters
-@@ -43,7 +47,6 @@
- name => $::swift::params::object_updater_service_name,
- enable => $enabled,
- provider => $::swift::params::service_provider,
-- require => Package['swift-object'],
- }
-
- service { 'swift-object-auditor':
-@@ -51,6 +54,5 @@
- name => $::swift::params::object_auditor_service_name,
- enable => $enabled,
- provider => $::swift::params::service_provider,
-- require => Package['swift-object'],
+@@ -58,7 +62,6 @@ class swift::storage::object(
+ enabled => $enabled,
+ config_file_name => $config_file_name,
+ service_provider => $service_provider,
+- require => Package['swift-object'],
+ subscribe => File["/etc/swift/${config_file_name}"],
}
}
+
--- openstack-swift-6.1.0/manifests/storage/generic.pp.orig 2016-04-21 08:41:14.272088204 -0700
+++ openstack-swift-6.1.0/manifests/storage/generic.pp 2016-04-21 08:41:48.797848159 -0700
@@ -1,3 +1,7 @@
@@ -88,41 +76,40 @@
# Creates the files packages and services that are
# needed to deploy each type of storage server.
#
-@@ -42,21 +46,6 @@
-
+@@ -47,20 +51,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"],
+- name => getvar("::swift::params::${name}_package_name"),
+- tag => ['openstack', 'swift-package'],
+- before => Service["swift-${name}-server", "swift-${name}-replicator"],
- }
-
- file { "/etc/swift/${name}-server/":
-- ensure => directory,
-- owner => 'swift',
-- group => 'swift',
+- ensure => directory,
+- owner => 'swift',
+- group => 'swift',
+- require => Package["swift-${name}"],
- }
-
if $manage_service {
if $enabled {
$service_ensure = 'running'
-@@ -71,7 +60,6 @@
- enable => $enabled,
- hasstatus => true,
- provider => $service_provider,
-- subscribe => Package["swift-${name}"],
+@@ -75,7 +65,6 @@ define swift::storage::generic(
+ enabled => $enabled,
+ config_file_name => $config_file_name,
+ service_provider => $service_provider,
+- subscribe => Package["swift-${name}"],
}
-
- service { "swift-${name}-replicator":
-@@ -80,7 +68,6 @@
- enable => $enabled,
- hasstatus => true,
- provider => $service_provider,
-- subscribe => Package["swift-${name}"],
+
+ swift::service { "swift-${name}-replicator":
+@@ -84,7 +73,6 @@ define swift::storage::generic(
+ enabled => $enabled,
+ config_file_name => $config_file_name,
+ service_provider => $service_provider,
+- subscribe => Package["swift-${name}"],
}
-
- }
+
+ swift::service { "swift-${name}-auditor":
--- a/components/ruby/puppet-modules/openstack-vswitch/Makefile Wed Sep 07 14:48:35 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-vswitch/Makefile Wed Sep 07 14:48:35 2016 -0700
@@ -26,16 +26,16 @@
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME= openstack-vswitch
-COMPONENT_VERSION= 4.0.0
+COMPONENT_VERSION= 4.2.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:5af96968aa60350cb00fce53d6f77667b49361b1edb114ce21f8f85c4272d84d
-COMPONENT_ARCHIVE_URL= http://forgeapi.puppetlabs.com/v3/files/$(COMPONENT_ARCHIVE)
+ sha256:bc60c847bc1fb1a4d63da39532162b1283ea6ec824591749619f698fd576eeb2
+COMPONENT_ARCHIVE_URL= http://tarballs.openstack.org/puppet-vswitch/puppet-vswitch-$(COMPONENT_VERSION).tar.gz
COMPONENT_PROJECT_URL= http://www.openstack.org/
COMPONENT_BUGDB= service/openvswitch
-TPNO= 28288
+TPNO= 30884
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/puppetmodule.mk