Browse Source

Merge "[suse] Update copyright/ownership information"

changes/37/392737/1
Jenkins 5 years ago
committed by Gerrit Code Review
parent
commit
ceb59dd1c4
3 changed files with 12 additions and 26 deletions
  1. +3
    -3
      contrib/drivers/k8s_opensuse_v1/setup.py
  2. +8
    -22
      contrib/drivers/k8s_opensuse_v1/templates/README.md
  3. +1
    -1
      contrib/drivers/k8s_opensuse_v1/version.py

+ 3
- 3
contrib/drivers/k8s_opensuse_v1/setup.py View File

@ -1,5 +1,5 @@
#!/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");
# you may not use this file except in compliance with the License.
@ -23,8 +23,8 @@ setuptools.setup(
package_data={
'k8s_opensuse_v1': ['templates/*', 'templates/fragments/*']
},
author="Michal Jura",
author_email="mjura@suse.com",
author="SUSE Linux GmbH",
author_email="opensuse-cloud@opensuse.org",
description="Magnum openSUSE Kubernetes driver",
license="Apache",
keywords="magnum opensuse driver",


+ 8
- 22
contrib/drivers/k8s_opensuse_v1/templates/README.md View File

@ -14,17 +14,10 @@ pods deployed on different minions.
## 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
These templates will work with either CentOS Atomic Host or Fedora 21
Atomic or OpenSUSE Atomic.
These templates will work with either openSUSE JeOS or SLES JeOS images
that are prepared for Docker and Kubernetes.
You can enable docker registry v2 by setting the "registry_enabled"
parameter to "true".
@ -112,7 +105,7 @@ these commands.
## License
Copyright 2014 Lars Kellogg-Stedman <lars@redhat.com>
Copyright 2016 SUSE Linux GmbH
Licensed under the Apache License, Version 2.0 (the "License");
you may not use these files except in compliance with the License.
@ -128,16 +121,9 @@ limitations under the License.
## Contributing
Please submit bugs and pull requests via the [GitHub repository][] at
https://github.com/larsks/heat-kubernetes/.
When submitting pull requests:
- 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.
Please submit bugs and pull requests via the Gerrit repository at
https://review.openstack.org/. For more information, please refer
to the following resources:
[github repository]: https://github.com/larsks/heat-kubernetes/
* **Documentation:** http://docs.openstack.org/developer/magnum
* **Source:** http://git.openstack.org/cgit/openstack/magnum

+ 1
- 1
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");
# you may not use this file except in compliance with the License.


Loading…
Cancel
Save