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
This commit is contained in:
parent
34ecd53afe
commit
60657cc21d
|
@ -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…
Reference in New Issue