Merge "Revert "Use symlinks for common template files""

changes/65/337965/10
Jenkins 6 years ago committed by Gerrit Code Review
commit 778f144fd4
  1. 4
      magnum/drivers/k8s_coreos_v1/template_def.py
  2. 1
      magnum/drivers/k8s_coreos_v1/templates/common
  3. 4
      magnum/drivers/k8s_fedora_atomic_v1/template_def.py
  4. 1
      magnum/drivers/k8s_fedora_atomic_v1/templates/common
  5. 2
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
  6. 4
      magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
  7. 4
      magnum/drivers/mesos_ubuntu_v1/template_def.py
  8. 1
      magnum/drivers/mesos_ubuntu_v1/templates/common
  9. 4
      magnum/drivers/swarm_fedora_atomic_v1/template_def.py
  10. 1
      magnum/drivers/swarm_fedora_atomic_v1/templates/common
  11. 2
      magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
  12. 4
      magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
  13. 10
      magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
  14. 8
      magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
  15. 10
      magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py

@ -129,9 +129,9 @@ class CoreOSK8sTemplateDefinition(K8sTemplateDefinition):
def get_env_files(self, baymodel):
if baymodel.master_lb_enabled:
return ['common/environments/with_master_lb.yaml']
return ['../../common/templates/environments/with_master_lb.yaml']
else:
return ['common/environments/no_master_lb.yaml']
return ['../../common/templates/environments/no_master_lb.yaml']
@property
def template_path(self):

@ -153,9 +153,9 @@ class AtomicK8sTemplateDefinition(K8sTemplateDefinition):
def get_env_files(self, baymodel):
if baymodel.master_lb_enabled:
return ['common/environments/with_master_lb.yaml']
return ['../../common/templates/environments/with_master_lb.yaml']
else:
return ['common/environments/no_master_lb.yaml']
return ['../../common/templates/environments/no_master_lb.yaml']
@property
def template_path(self):

@ -268,7 +268,7 @@ resources:
config:
str_replace:
params:
$configure_docker_storage_driver: {get_file: common/fragments/configure_docker_storage_driver_atomic.sh}
$configure_docker_storage_driver: {get_file: ../../common/templates/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/fragments/configure_docker_storage_driver_atomic.sh}
$configure_docker_storage_driver: {get_file: ../../common/templates/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/fragments/configure-docker-registry.sh}
config: {get_file: ../../common/templates/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/environments/with_master_lb.yaml']
return ['../../common/templates/environments/with_master_lb.yaml']
else:
return ['common/environments/no_master_lb.yaml']
return ['../../common/templates/environments/no_master_lb.yaml']
@property
def template_path(self):

@ -112,9 +112,9 @@ class AtomicSwarmTemplateDefinition(template_def.BaseTemplateDefinition):
def get_env_files(self, baymodel):
if baymodel.master_lb_enabled:
return ['common/environments/with_master_lb.yaml']
return ['../../common/templates/environments/with_master_lb.yaml']
else:
return ['common/environments/no_master_lb.yaml']
return ['../../common/templates/environments/no_master_lb.yaml']
@property
def template_path(self):

@ -251,7 +251,7 @@ resources:
config:
str_replace:
params:
$configure_docker_storage_driver: {get_file: common/fragments/configure_docker_storage_driver_atomic.sh}
$configure_docker_storage_driver: {get_file: ../../common/templates/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/fragments/configure_docker_storage_driver_atomic.sh}
$configure_docker_storage_driver: {get_file: ../../common/templates/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/fragments/configure-docker-registry.sh}
config: {get_file: ../../common/templates/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/environments/no_master_lb.yaml'],
['../../common/templates/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/environments/no_master_lb.yaml'],
['../../common/templates/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/environments/no_master_lb.yaml'],
['../../common/templates/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/environments/no_master_lb.yaml'],
['../../common/templates/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/environments/no_master_lb.yaml'],
['../../common/templates/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/environments/no_master_lb.yaml'],
['../../common/templates/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/environments/no_master_lb.yaml'],
['../../common/templates/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/environments/with_master_lb.yaml'],
['../../common/templates/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/environments/with_master_lb.yaml'],
['../../common/templates/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/environments/no_master_lb.yaml'],
['../../common/templates/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/environments/no_master_lb.yaml'],
['../../common/templates/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/environments/no_master_lb.yaml'],
['../../common/templates/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/environments/with_master_lb.yaml'],
['../../common/templates/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/environments/with_master_lb.yaml'],
['../../common/templates/environments/with_master_lb.yaml'],
env_files)
@patch('magnum.conductor.utils.retrieve_baymodel')

Loading…
Cancel
Save