From b26c2d4a206a60c5fc5f7dec6330bb39f6229ffb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 20 Oct 2016 22:53:56 +0200 Subject: [PATCH] [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 --- contrib/drivers/k8s_opensuse_v1/setup.py | 6 ++-- .../k8s_opensuse_v1/templates/README.md | 30 +++++-------------- contrib/drivers/k8s_opensuse_v1/version.py | 2 +- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/contrib/drivers/k8s_opensuse_v1/setup.py b/contrib/drivers/k8s_opensuse_v1/setup.py index 284a6f2019..ee14343c0e 100644 --- a/contrib/drivers/k8s_opensuse_v1/setup.py +++ b/contrib/drivers/k8s_opensuse_v1/setup.py @@ -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", diff --git a/contrib/drivers/k8s_opensuse_v1/templates/README.md b/contrib/drivers/k8s_opensuse_v1/templates/README.md index a9052835e5..efa24c4597 100644 --- a/contrib/drivers/k8s_opensuse_v1/templates/README.md +++ b/contrib/drivers/k8s_opensuse_v1/templates/README.md @@ -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 +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/. +Please submit bugs and pull requests via the Gerrit repository at +https://review.openstack.org/. For more information, please refer +to the following resources: -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. - -[github repository]: https://github.com/larsks/heat-kubernetes/ +* **Documentation:** http://docs.openstack.org/developer/magnum +* **Source:** http://git.openstack.org/cgit/openstack/magnum diff --git a/contrib/drivers/k8s_opensuse_v1/version.py b/contrib/drivers/k8s_opensuse_v1/version.py index 9e70713250..26d22f7497 100644 --- a/contrib/drivers/k8s_opensuse_v1/version.py +++ b/contrib/drivers/k8s_opensuse_v1/version.py @@ -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.