diff options
| -rw-r--r-- | MANIFEST.in | 1 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | babel.cfg | 1 | ||||
| -rw-r--r-- | overcloud-source.yaml | 22 | ||||
| -rw-r--r-- | requirements.txt | 1 | ||||
| -rw-r--r-- | setup.cfg | 24 | ||||
| -rw-r--r-- | setup.py | 22 | ||||
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rw-r--r-- | tox.ini | 11 | ||||
| -rw-r--r-- | tuskar-source.yaml | 21 | ||||
| -rw-r--r-- | undercloud-vm.yaml | 1 |
11 files changed, 98 insertions, 11 deletions
diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..bb3ec5f0 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +include README.md @@ -2,5 +2,9 @@ overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml python merge.py $< > $@.tmp mv $@.tmp $@ +undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml + python merge.py $^ > $@.tmp + mv $@.tmp $@ + test: @bash test_merge.bash diff --git a/babel.cfg b/babel.cfg new file mode 100644 index 00000000..efceab81 --- /dev/null +++ b/babel.cfg @@ -0,0 +1 @@ +[python: **.py] diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 75506f4e..c8aa0465 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -187,17 +187,6 @@ Resources: - networks service-password: Ref: GlancePassword - os-collect-config: - cfn: - access_key_id: - Ref: Key - path: notcomputeConfig.Metadata - secret_access_key: - Fn::GetAtt: - - Key - - SecretAccessKey - stack_name: - Ref: AWS::StackName heat: admin_password: Ref: HeatPassword @@ -298,6 +287,17 @@ Resources: metadata-proxy: true service-password: Ref: NovaPassword + os-collect-config: + cfn: + access_key_id: + Ref: Key + path: notcomputeConfig.Metadata + secret_access_key: + Fn::GetAtt: + - Key + - SecretAccessKey + stack_name: + Ref: AWS::StackName rabbit: host: Fn::Select: diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..4e46b891 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +pbr>=0.5.21,<1.0 diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..1a5cb59b --- /dev/null +++ b/setup.cfg @@ -0,0 +1,24 @@ +[metadata] +name = tripleo-heat-templates +version = 0.0.1 +summary = Heat templates for deploying OpenStack with OpenStack. +description-file = + README.md +author = OpenStack +author_email = openstack-dev@lists.openstack.org +license = Apache License (2.0) +home-page = https://git.openstack.org/cgit/openstack/tripleo-heat-templates +classifier = + Environment :: OpenStack + Development Status :: 3 - Alpha + License :: OSI Approved :: Apache Software License + Operating System :: POSIX :: Linux + Programming Language :: Other + Environment :: Console + +[files] +data_files = + share/tripleo-heat-tempaltes/examples = examples/* + share/tripleo-heat-templates = + Makefile + *.yaml diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..70c2b3f3 --- /dev/null +++ b/setup.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT +import setuptools + +setuptools.setup( + setup_requires=['pbr'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 00000000..c3726e8b --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1 @@ +pyyaml diff --git a/tox.ini b/tox.ini new file mode 100644 index 00000000..a7823b10 --- /dev/null +++ b/tox.ini @@ -0,0 +1,11 @@ +[tox] +minversion = 1.6 +skipsdist = True + +[testenv] +usedevelop = True +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + +[testenv:venv] +commands = {posargs} diff --git a/tuskar-source.yaml b/tuskar-source.yaml new file mode 100644 index 00000000..0d4cc5f6 --- /dev/null +++ b/tuskar-source.yaml @@ -0,0 +1,21 @@ +Parameters: + # NOTE(rpodolyaka): limitation of tuskar-api, see https://bugs.launchpad.net/tuskar/+bug/1235236 + OvercloudAdminPassword: + Default: unset + Description: The password of admin user of the overcloud (required by some services in the under cloud) + Type: String + OvercloudKeystoneHost: + Description: The Overcloud Host running Keystone + Type: String +Resources: + undercloudTuskarVm: + Type: AWS::AutoScaling::LaunchConfiguration + Metadata: + OpenStack::Role: notcomputeConfig + tuskar: + db: mysql://tuskar:unset@localhost/tuskar?charset=utf8 + user: admin + tenant_name: admin + password: {Ref: AdminPassword} + overcloud-admin-password: {Ref: OvercloudAdminPassword} + overcloud-keystone-host: {Ref: OvercloudKeystoneHost} diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index d3394c20..4e09e773 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -84,6 +84,7 @@ Resources: ImageId: '0' InstanceType: foo Metadata: + OpenStack::Role: notcomputeConfig OpenStack::Heat::Stack: {} Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, neutron-network-node ] admin-password: |