diff --git a/magnum/drivers/common/template_def.py b/magnum/drivers/common/template_def.py index 1f6f9b28cc..6e90e2f4ca 100644 --- a/magnum/drivers/common/template_def.py +++ b/magnum/drivers/common/template_def.py @@ -30,6 +30,8 @@ from requests import exceptions as req_exceptions LOG = logging.getLogger(__name__) +COMMON_TEMPLATES_PATH = "../../common/templates/" +COMMON_ENV_PATH = COMMON_TEMPLATES_PATH + "environments/" template_def_opts = [ cfg.StrOpt('etcd_discovery_service_endpoint_format', diff --git a/magnum/drivers/k8s_coreos_v1/template_def.py b/magnum/drivers/k8s_coreos_v1/template_def.py index df2998d5d5..a1bcef0afb 100644 --- a/magnum/drivers/k8s_coreos_v1/template_def.py +++ b/magnum/drivers/k8s_coreos_v1/template_def.py @@ -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 [template_def.COMMON_ENV_PATH + 'with_master_lb.yaml'] else: - return ['../../common/templates/environments/no_master_lb.yaml'] + return [template_def.COMMON_ENV_PATH + 'no_master_lb.yaml'] @property def template_path(self): diff --git a/magnum/drivers/k8s_fedora_atomic_v1/template_def.py b/magnum/drivers/k8s_fedora_atomic_v1/template_def.py index dedf9d9a53..0b14af45f7 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/template_def.py +++ b/magnum/drivers/k8s_fedora_atomic_v1/template_def.py @@ -188,16 +188,16 @@ class AtomicK8sTemplateDefinition(K8sTemplateDefinition): env_files = [] if baymodel.master_lb_enabled: env_files.append( - '../../common/templates/environments/with_master_lb.yaml') + template_def.COMMON_ENV_PATH + 'with_master_lb.yaml') else: env_files.append( - '../../common/templates/environments/no_master_lb.yaml') + template_def.COMMON_ENV_PATH + 'no_master_lb.yaml') if baymodel.floating_ip_enabled: env_files.append( - '../../common/templates/environments/enable_floating_ip.yaml') + template_def.COMMON_ENV_PATH + 'enable_floating_ip.yaml') else: env_files.append( - '../../common/templates/environments/disable_floating_ip.yaml') + template_def.COMMON_ENV_PATH + 'disable_floating_ip.yaml') return env_files diff --git a/magnum/drivers/mesos_ubuntu_v1/template_def.py b/magnum/drivers/mesos_ubuntu_v1/template_def.py index d571cfd519..858a6ed4c5 100644 --- a/magnum/drivers/mesos_ubuntu_v1/template_def.py +++ b/magnum/drivers/mesos_ubuntu_v1/template_def.py @@ -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 [template_def.COMMON_ENV_PATH + 'with_master_lb.yaml'] else: - return ['../../common/templates/environments/no_master_lb.yaml'] + return [template_def.COMMON_ENV_PATH + 'no_master_lb.yaml'] @property def template_path(self): diff --git a/magnum/drivers/swarm_fedora_atomic_v1/template_def.py b/magnum/drivers/swarm_fedora_atomic_v1/template_def.py index bea785d2f2..8472d1be3f 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/template_def.py +++ b/magnum/drivers/swarm_fedora_atomic_v1/template_def.py @@ -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 [template_def.COMMON_ENV_PATH + 'with_master_lb.yaml'] else: - return ['../../common/templates/environments/no_master_lb.yaml'] + return [template_def.COMMON_ENV_PATH + 'no_master_lb.yaml'] @property def template_path(self):