Use symlinks for common template files
This patch establishes a convention of using a symlink named "common" in drivers/{driver}/templates/ that points to drivers/common/templates/. This has two benefits. First, it lowers the burden of forking a driver by allowing drivers/common/templates/ to be copied over the symlink, rather than having to update all of the paths in the templates and driver code. Second, it shortens the paths used, which makes things cleaner. Change-Id: I9176ec03905d0a87a43ba6bedf1f768b2b316125 Partially-implements: blueprint bay-drivers
This commit is contained in:
parent
a72817c77e
commit
748cf13182
|
@ -129,9 +129,9 @@ class CoreOSK8sTemplateDefinition(K8sTemplateDefinition):
|
|||
|
||||
def get_env_files(self, baymodel):
|
||||
if baymodel.master_lb_enabled:
|
||||
return ['../../common/templates/environments/with_master_lb.yaml']
|
||||
return ['common/environments/with_master_lb.yaml']
|
||||
else:
|
||||
return ['../../common/templates/environments/no_master_lb.yaml']
|
||||
return ['common/environments/no_master_lb.yaml']
|
||||
|
||||
@property
|
||||
def template_path(self):
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
../../common/templates
|
|
@ -150,9 +150,9 @@ class AtomicK8sTemplateDefinition(K8sTemplateDefinition):
|
|||
|
||||
def get_env_files(self, baymodel):
|
||||
if baymodel.master_lb_enabled:
|
||||
return ['../../common/templates/environments/with_master_lb.yaml']
|
||||
return ['common/environments/with_master_lb.yaml']
|
||||
else:
|
||||
return ['../../common/templates/environments/no_master_lb.yaml']
|
||||
return ['common/environments/no_master_lb.yaml']
|
||||
|
||||
@property
|
||||
def template_path(self):
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
../../common/templates
|
|
@ -268,7 +268,7 @@ resources:
|
|||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
|
||||
$configure_docker_storage_driver: {get_file: common/fragments/configure_docker_storage_driver_atomic.sh}
|
||||
template: {get_file: fragments/configure-docker-storage.sh}
|
||||
|
||||
configure_etcd:
|
||||
|
|
|
@ -275,14 +275,14 @@ resources:
|
|||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
|
||||
$configure_docker_storage_driver: {get_file: common/fragments/configure_docker_storage_driver_atomic.sh}
|
||||
template: {get_file: fragments/configure-docker-storage.sh}
|
||||
|
||||
configure_docker_registry:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: ungrouped
|
||||
config: {get_file: ../../common/templates/fragments/configure-docker-registry.sh}
|
||||
config: {get_file: common/fragments/configure-docker-registry.sh}
|
||||
|
||||
configure_kubernetes_minion:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
|
|
|
@ -83,9 +83,9 @@ class UbuntuMesosTemplateDefinition(template_def.BaseTemplateDefinition):
|
|||
|
||||
def get_env_files(self, baymodel):
|
||||
if baymodel.master_lb_enabled:
|
||||
return ['../../common/templates/environments/with_master_lb.yaml']
|
||||
return ['common/environments/with_master_lb.yaml']
|
||||
else:
|
||||
return ['../../common/templates/environments/no_master_lb.yaml']
|
||||
return ['common/environments/no_master_lb.yaml']
|
||||
|
||||
@property
|
||||
def template_path(self):
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
../../common/templates
|
|
@ -112,9 +112,9 @@ class AtomicSwarmTemplateDefinition(template_def.BaseTemplateDefinition):
|
|||
|
||||
def get_env_files(self, baymodel):
|
||||
if baymodel.master_lb_enabled:
|
||||
return ['../../common/templates/environments/with_master_lb.yaml']
|
||||
return ['common/environments/with_master_lb.yaml']
|
||||
else:
|
||||
return ['../../common/templates/environments/no_master_lb.yaml']
|
||||
return ['common/environments/no_master_lb.yaml']
|
||||
|
||||
@property
|
||||
def template_path(self):
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
../../common/templates
|
|
@ -251,7 +251,7 @@ resources:
|
|||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
|
||||
$configure_docker_storage_driver: {get_file: common/fragments/configure_docker_storage_driver_atomic.sh}
|
||||
template: {get_file: fragments/configure-docker-storage.sh}
|
||||
|
||||
make_cert:
|
||||
|
|
|
@ -222,14 +222,14 @@ resources:
|
|||
config:
|
||||
str_replace:
|
||||
params:
|
||||
$configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_atomic.sh}
|
||||
$configure_docker_storage_driver: {get_file: common/fragments/configure_docker_storage_driver_atomic.sh}
|
||||
template: {get_file: fragments/configure-docker-storage.sh}
|
||||
|
||||
configure_docker_registry:
|
||||
type: OS::Heat::SoftwareConfig
|
||||
properties:
|
||||
group: ungrouped
|
||||
config: {get_file: ../../common/templates/fragments/configure-docker-registry.sh}
|
||||
config: {get_file: common/fragments/configure-docker-registry.sh}
|
||||
|
||||
write_docker_service:
|
||||
type: "OS::Heat::SoftwareConfig"
|
||||
|
|
|
@ -178,7 +178,7 @@ class TestBayConductorWithK8s(base.TestCase):
|
|||
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/no_master_lb.yaml'],
|
||||
['common/environments/no_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('requests.get')
|
||||
|
@ -246,7 +246,7 @@ class TestBayConductorWithK8s(base.TestCase):
|
|||
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/no_master_lb.yaml'],
|
||||
['common/environments/no_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('requests.get')
|
||||
|
@ -302,7 +302,7 @@ class TestBayConductorWithK8s(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/no_master_lb.yaml'],
|
||||
['common/environments/no_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('requests.get')
|
||||
|
@ -356,7 +356,7 @@ class TestBayConductorWithK8s(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/no_master_lb.yaml'],
|
||||
['common/environments/no_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('requests.get')
|
||||
|
@ -518,7 +518,7 @@ class TestBayConductorWithK8s(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/no_master_lb.yaml'],
|
||||
['common/environments/no_master_lb.yaml'],
|
||||
env_files)
|
||||
reqget.assert_called_once_with('http://etcd/test?size=1')
|
||||
|
||||
|
|
|
@ -122,7 +122,7 @@ class TestBayConductorWithMesos(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/no_master_lb.yaml'],
|
||||
['common/environments/no_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('magnum.objects.BayModel.get_by_uuid')
|
||||
|
@ -168,7 +168,7 @@ class TestBayConductorWithMesos(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/no_master_lb.yaml'],
|
||||
['common/environments/no_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('magnum.objects.BayModel.get_by_uuid')
|
||||
|
@ -217,7 +217,7 @@ class TestBayConductorWithMesos(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/with_master_lb.yaml'],
|
||||
['common/environments/with_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('magnum.objects.BayModel.get_by_uuid')
|
||||
|
@ -267,7 +267,7 @@ class TestBayConductorWithMesos(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/with_master_lb.yaml'],
|
||||
['common/environments/with_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('magnum.conductor.utils.retrieve_baymodel')
|
||||
|
|
|
@ -128,7 +128,7 @@ class TestBayConductorWithSwarm(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/no_master_lb.yaml'],
|
||||
['common/environments/no_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('requests.get')
|
||||
|
@ -190,7 +190,7 @@ class TestBayConductorWithSwarm(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/no_master_lb.yaml'],
|
||||
['common/environments/no_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('requests.get')
|
||||
|
@ -244,7 +244,7 @@ class TestBayConductorWithSwarm(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/no_master_lb.yaml'],
|
||||
['common/environments/no_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('requests.get')
|
||||
|
@ -300,7 +300,7 @@ class TestBayConductorWithSwarm(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/with_master_lb.yaml'],
|
||||
['common/environments/with_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('requests.get')
|
||||
|
@ -357,7 +357,7 @@ class TestBayConductorWithSwarm(base.TestCase):
|
|||
}
|
||||
self.assertEqual(expected, definition)
|
||||
self.assertEqual(
|
||||
['../../common/templates/environments/with_master_lb.yaml'],
|
||||
['common/environments/with_master_lb.yaml'],
|
||||
env_files)
|
||||
|
||||
@patch('magnum.conductor.utils.retrieve_baymodel')
|
||||
|
|
Loading…
Reference in New Issue