orchestration refactor for Pike and Chef 13
- implemented foodcritic and cookstyle corrections - deprecated node.foo.bar method access for node['foo']['bar'] bracket syntax - added interface for internal endpoint - moved dpkg options to common cookbook Implements blueprint modern-chef Change-Id: I361aed3d84a6e7225d7d803f1855ce37da568eac
This commit is contained in:
parent
37737b68c1
commit
2bcd59a687
|
@ -0,0 +1,176 @@
|
||||||
|
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
|
@ -93,6 +93,6 @@ when 'debian'
|
||||||
'heat_api_cloudwatch_service' => 'heat-api-cloudwatch',
|
'heat_api_cloudwatch_service' => 'heat-api-cloudwatch',
|
||||||
'heat_engine_packages' => ['heat-engine'],
|
'heat_engine_packages' => ['heat-engine'],
|
||||||
'heat_engine_service' => 'heat-engine',
|
'heat_engine_service' => 'heat-engine',
|
||||||
'package_overrides' => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'",
|
'package_overrides' => '',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
name 'openstack-orchestration'
|
name 'openstack-orchestration'
|
||||||
maintainer 'openstack-chef'
|
maintainer 'openstack-chef'
|
||||||
maintainer_email 'openstack-dev@lists.openstack.org'
|
maintainer_email 'openstack-dev@lists.openstack.org'
|
||||||
license 'Apache 2.0'
|
license 'Apache-2.0'
|
||||||
description 'Installs and configures the Heat Service'
|
description 'Installs and configures the Heat Service'
|
||||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||||
version '16.0.0'
|
version '16.0.0'
|
||||||
|
|
|
@ -79,11 +79,11 @@ node.default['openstack']['orchestration']['conf'].tap do |conf|
|
||||||
conf['clients_keystone']['auth_uri'] = base_auth_uri
|
conf['clients_keystone']['auth_uri'] = base_auth_uri
|
||||||
conf['ec2authtoken']['auth_uri'] = ec2_auth_uri
|
conf['ec2authtoken']['auth_uri'] = ec2_auth_uri
|
||||||
conf['heat_api']['bind_host'] = bind_address api_bind
|
conf['heat_api']['bind_host'] = bind_address api_bind
|
||||||
conf['heat_api']['bind_port'] = api_bind.port
|
conf['heat_api']['bind_port'] = api_bind['port']
|
||||||
conf['heat_api_cfn']['bind_host'] = bind_address api_cfn_bind
|
conf['heat_api_cfn']['bind_host'] = bind_address api_cfn_bind
|
||||||
conf['heat_api_cfn']['bind_port'] = api_cfn_bind.port
|
conf['heat_api_cfn']['bind_port'] = api_cfn_bind['port']
|
||||||
conf['heat_api_cloudwatch']['bind_host'] = bind_address api_cw_bind
|
conf['heat_api_cloudwatch']['bind_host'] = bind_address api_cw_bind
|
||||||
conf['heat_api_cloudwatch']['bind_port'] = api_cw_bind.port
|
conf['heat_api_cloudwatch']['bind_port'] = api_cw_bind['port']
|
||||||
conf['keystone_authtoken']['auth_url'] = auth_uri
|
conf['keystone_authtoken']['auth_url'] = auth_uri
|
||||||
conf['trustee']['auth_url'] = identity_admin_endpoint
|
conf['trustee']['auth_url'] = identity_admin_endpoint
|
||||||
end
|
end
|
||||||
|
|
|
@ -71,7 +71,7 @@ openstack_service service_name do
|
||||||
end
|
end
|
||||||
|
|
||||||
# Register Orchestration Public-Endpoint
|
# Register Orchestration Public-Endpoint
|
||||||
openstack_endpoint service_type do
|
openstack_endpoint service_type do # ~FC005
|
||||||
service_name service_name
|
service_name service_name
|
||||||
interface 'public'
|
interface 'public'
|
||||||
url public_heat_endpoint.to_s
|
url public_heat_endpoint.to_s
|
||||||
|
@ -82,6 +82,7 @@ end
|
||||||
# Register Orchestration Internal-Endpoint
|
# Register Orchestration Internal-Endpoint
|
||||||
openstack_endpoint service_type do
|
openstack_endpoint service_type do
|
||||||
service_name service_name
|
service_name service_name
|
||||||
|
interface 'internal'
|
||||||
url internal_heat_endpoint.to_s
|
url internal_heat_endpoint.to_s
|
||||||
region region
|
region region
|
||||||
connection_params connection_params
|
connection_params connection_params
|
||||||
|
@ -134,7 +135,7 @@ openstack_service 'heat-cfn' do
|
||||||
end
|
end
|
||||||
|
|
||||||
# Register Heat API CloudFormation Public-Endpoint
|
# Register Heat API CloudFormation Public-Endpoint
|
||||||
openstack_endpoint 'cloudformation' do
|
openstack_endpoint 'cloudformation' do # ~FC005
|
||||||
service_name 'heat-cfn'
|
service_name 'heat-cfn'
|
||||||
interface 'public'
|
interface 'public'
|
||||||
url public_heat_cfn_endpoint.to_s
|
url public_heat_cfn_endpoint.to_s
|
||||||
|
@ -145,6 +146,7 @@ end
|
||||||
# Register Heat API CloudFormation Internal-Endpoint
|
# Register Heat API CloudFormation Internal-Endpoint
|
||||||
openstack_endpoint 'cloudformation' do
|
openstack_endpoint 'cloudformation' do
|
||||||
service_name 'heat-cfn'
|
service_name 'heat-cfn'
|
||||||
|
interface 'internal'
|
||||||
url internal_heat_cfn_endpoint.to_s
|
url internal_heat_cfn_endpoint.to_s
|
||||||
region region
|
region region
|
||||||
connection_params connection_params
|
connection_params connection_params
|
||||||
|
|
|
@ -21,6 +21,7 @@ describe 'openstack-orchestration::identity_registration' do
|
||||||
service_user = 'heat'
|
service_user = 'heat'
|
||||||
stack_domain_admin = 'heat_domain_admin'
|
stack_domain_admin = 'heat_domain_admin'
|
||||||
stack_domain_name = 'heat'
|
stack_domain_name = 'heat'
|
||||||
|
stack_domain_password = 'heat_domain_pass'
|
||||||
url = 'http://127.0.0.1:8004/v1/%(tenant_id)s'
|
url = 'http://127.0.0.1:8004/v1/%(tenant_id)s'
|
||||||
region = 'RegionOne'
|
region = 'RegionOne'
|
||||||
project_name = 'service'
|
project_name = 'service'
|
||||||
|
@ -94,7 +95,6 @@ describe 'openstack-orchestration::identity_registration' do
|
||||||
).with(
|
).with(
|
||||||
project_name: project_name,
|
project_name: project_name,
|
||||||
role_name: role_name,
|
role_name: role_name,
|
||||||
password: password,
|
|
||||||
connection_params: connection_params
|
connection_params: connection_params
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
@ -111,7 +111,7 @@ describe 'openstack-orchestration::identity_registration' do
|
||||||
expect(chef_run).to create_openstack_user(
|
expect(chef_run).to create_openstack_user(
|
||||||
stack_domain_admin
|
stack_domain_admin
|
||||||
).with(
|
).with(
|
||||||
password: password,
|
password: stack_domain_password,
|
||||||
connection_params: connection_params
|
connection_params: connection_params
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
@ -122,7 +122,6 @@ describe 'openstack-orchestration::identity_registration' do
|
||||||
).with(
|
).with(
|
||||||
domain_name: stack_domain_name,
|
domain_name: stack_domain_name,
|
||||||
role_name: 'admin',
|
role_name: 'admin',
|
||||||
password: password,
|
|
||||||
connection_params: connection_params
|
connection_params: connection_params
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
|
@ -9,7 +9,7 @@ require 'chef/application'
|
||||||
LOG_LEVEL = :fatal
|
LOG_LEVEL = :fatal
|
||||||
REDHAT_OPTS = {
|
REDHAT_OPTS = {
|
||||||
platform: 'redhat',
|
platform: 'redhat',
|
||||||
version: '7.1',
|
version: '7.3',
|
||||||
log_level: ::LOG_LEVEL,
|
log_level: ::LOG_LEVEL,
|
||||||
}.freeze
|
}.freeze
|
||||||
UBUNTU_OPTS = {
|
UBUNTU_OPTS = {
|
||||||
|
@ -17,11 +17,6 @@ UBUNTU_OPTS = {
|
||||||
version: '16.04',
|
version: '16.04',
|
||||||
log_level: ::LOG_LEVEL,
|
log_level: ::LOG_LEVEL,
|
||||||
}.freeze
|
}.freeze
|
||||||
SUSE_OPTS = {
|
|
||||||
platform: 'suse',
|
|
||||||
version: '11.3',
|
|
||||||
log_level: ::LOG_LEVEL,
|
|
||||||
}.freeze
|
|
||||||
|
|
||||||
shared_context 'orchestration_stubs' do
|
shared_context 'orchestration_stubs' do
|
||||||
before do
|
before do
|
||||||
|
@ -48,7 +43,7 @@ shared_context 'orchestration_stubs' do
|
||||||
.and_return 'heat-pass'
|
.and_return 'heat-pass'
|
||||||
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
|
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
|
||||||
.with('user', 'heat_domain_admin')
|
.with('user', 'heat_domain_admin')
|
||||||
.and_return 'heat-pass'
|
.and_return 'heat_domain_pass'
|
||||||
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
|
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
|
||||||
.with('user', 'admin')
|
.with('user', 'admin')
|
||||||
.and_return 'admin-pass'
|
.and_return 'admin-pass'
|
||||||
|
|
Loading…
Reference in New Issue