openstack
/
magnum
Code Issues Proposed changes

[suse] Update copyright/ownership information 

The initial import was a bit of too much of a copy&paste, mildly
reword documentation and reflect copyright statements.

Change-Id: I64d51152e4b0081a7126777a8aedc54f38944502
This commit is contained in:
Dirk Mueller 2016-10-20 22:53:56 +02:00
parent 68af88a737
commit b26c2d4a20
3 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/drivers/k8s_opensuse_v1/setup.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# Copyright (c) 2015 Rackspace Inc. # Copyright (c) 2016 SUSE Linux GmbH
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -23,8 +23,8 @@ setuptools.setup(
package_data={ package_data={
'k8s_opensuse_v1': ['templates/*', 'templates/fragments/*'] 'k8s_opensuse_v1': ['templates/*', 'templates/fragments/*']
}, },
author="Michal Jura", author="SUSE Linux GmbH",
author_email="mjura@suse.com", author_email="opensuse-cloud@opensuse.org",
description="Magnum openSUSE Kubernetes driver", description="Magnum openSUSE Kubernetes driver",
license="Apache", license="Apache",
keywords="magnum opensuse driver", keywords="magnum opensuse driver",

30
contrib/drivers/k8s_opensuse_v1/templates/README.md
View File

@ -14,17 +14,10 @@ pods deployed on different minions.
## Requirements ## Requirements
### OpenStack
These templates will work with the Kilo version of Heat. They *may*
work with Juno as well as soon as [#1402894][] is resolved.
[#1402894]: https://bugs.launchpad.net/heat/+bug/1402894
### Guest image ### Guest image
These templates will work with either CentOS Atomic Host or Fedora 21 These templates will work with either openSUSE JeOS or SLES JeOS images
Atomic or OpenSUSE Atomic. that are prepared for Docker and Kubernetes.
You can enable docker registry v2 by setting the "registry_enabled" You can enable docker registry v2 by setting the "registry_enabled"
parameter to "true". parameter to "true".
@ -112,7 +105,7 @@ these commands.
## License ## License
Copyright 2014 Lars Kellogg-Stedman <lars@redhat.com> Copyright 2016 SUSE Linux GmbH
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use these files except in compliance with the License. you may not use these files except in compliance with the License.
@ -128,16 +121,9 @@ limitations under the License.
## Contributing ## Contributing
Please submit bugs and pull requests via the [GitHub repository][] at Please submit bugs and pull requests via the Gerrit repository at
https://github.com/larsks/heat-kubernetes/. https://review.openstack.org/. For more information, please refer
to the following resources:
When submitting pull requests: * **Documentation:** http://docs.openstack.org/developer/magnum
* **Source:** http://git.openstack.org/cgit/openstack/magnum
- Please ensure that each pull request contains a single commit and
contains only related changes. Put unrelated changes in multiple
pull requests.
- Please avoid conflating new features with
stylistic/formatting/cleanup changes.
[github repository]: https://github.com/larsks/heat-kubernetes/

2
contrib/drivers/k8s_opensuse_v1/version.py
View File

@ -1,4 +1,4 @@
# Copyright 2016 - Rackspace Hosting # Copyright 2016 - SUSE Linux GmbH
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.