Move folder heat-kubernetes to magnum/templates

We are now putting all templates under magnum/templates , so the
original template for k8s should also be moved here.

Change-Id: I44924911705578c1f55fa87df83d0a9a800576b5
Closes-Bug: #1425964
changes/29/159529/4
Jay Lau (Guangya Liu) 8 years ago
parent 34ecd53afe
commit 60657cc21d
  1. 3
      doc/source/dev/dev-quickstart.rst
  2. 4
      magnum/cmd/conductor.py
  3. 2
      magnum/conductor/handlers/bay_k8s_heat.py
  4. 0
      magnum/templates/heat-kubernetes/COPYING
  5. 0
      magnum/templates/heat-kubernetes/README.md
  6. 0
      magnum/templates/heat-kubernetes/beaker.yaml
  7. 0
      magnum/templates/heat-kubernetes/elements/README.md
  8. 0
      magnum/templates/heat-kubernetes/elements/kubernetes/elements-deps
  9. 0
      magnum/templates/heat-kubernetes/elements/kubernetes/package-installs.yaml
  10. 0
      magnum/templates/heat-kubernetes/fragments/add-to-docker-group.sh
  11. 0
      magnum/templates/heat-kubernetes/fragments/cfn-signal.sh
  12. 0
      magnum/templates/heat-kubernetes/fragments/configure-docker-storage.sh
  13. 0
      magnum/templates/heat-kubernetes/fragments/configure-flannel.sh
  14. 0
      magnum/templates/heat-kubernetes/fragments/configure-kubernetes-master.sh
  15. 0
      magnum/templates/heat-kubernetes/fragments/configure-kubernetes-minion.sh
  16. 0
      magnum/templates/heat-kubernetes/fragments/coreos.params.yaml
  17. 0
      magnum/templates/heat-kubernetes/fragments/disable-selinux.sh
  18. 0
      magnum/templates/heat-kubernetes/fragments/docker.service.yaml
  19. 0
      magnum/templates/heat-kubernetes/fragments/enable-etcd.sh
  20. 0
      magnum/templates/heat-kubernetes/fragments/enable-services-master.sh
  21. 0
      magnum/templates/heat-kubernetes/fragments/enable-services-minion.sh
  22. 0
      magnum/templates/heat-kubernetes/fragments/flannel-config.service.yaml
  23. 0
      magnum/templates/heat-kubernetes/fragments/kube-examples.yaml
  24. 0
      magnum/templates/heat-kubernetes/fragments/kube-user.yaml
  25. 0
      magnum/templates/heat-kubernetes/fragments/write-flannel-config.sh
  26. 0
      magnum/templates/heat-kubernetes/fragments/write-heat-params-master.sh
  27. 0
      magnum/templates/heat-kubernetes/fragments/write-heat-params-master.yaml
  28. 0
      magnum/templates/heat-kubernetes/fragments/write-heat-params.yaml
  29. 0
      magnum/templates/heat-kubernetes/kubecluster-coreos.yaml
  30. 0
      magnum/templates/heat-kubernetes/kubecluster-fedora-ironic.yaml
  31. 0
      magnum/templates/heat-kubernetes/kubecluster.yaml
  32. 0
      magnum/templates/heat-kubernetes/kubenode-coreos.yaml
  33. 0
      magnum/templates/heat-kubernetes/kubenode-fedora-ironic.yaml
  34. 0
      magnum/templates/heat-kubernetes/kubenode.yaml

@ -201,9 +201,6 @@ Next, clone and install magnum::
git clone https://github.com/stackforge/magnum
cd magnum
sudo pip install -e .
sudo mkdir -p /etc/magnum/templates
sudo cp -r etc/magnum/templates/heat-kubernetes \
/etc/magnum/templates/
Next configure Magnum::

@ -47,10 +47,6 @@ def main():
bay_k8s_heat.Handler()
]
# TODO(sdake): Presently Magnum only has one template file. As we go to
# Ironic, we will need a second template I somewhat it believes it makes
# sense to move these under the magnum/magnum/templates directory since
# they are a hardcoded dependency and not store them in etc.
if not os.path.isfile(cfg.CONF.k8s_heat.template_path):
LOG.error(_LE("The Heat template %s is not found. Install template.")
% (cfg.CONF.k8s_heat.template_path))

@ -30,7 +30,7 @@ from magnum.openstack.common import loopingcall
k8s_heat_opts = [
cfg.StrOpt('template_path',
default=
'/etc/magnum/templates/heat-kubernetes/kubecluster.yaml',
'~/magnum/magnum/templates/heat-kubernetes/kubecluster.yaml',
help=_(
'Location of template to build a k8s cluster. ')),
cfg.IntOpt('max_attempts',

Loading…
Cancel
Save