From 69a0ac36ae6a4c51782dbf42a52ee0141c3a1063 Mon Sep 17 00:00:00 2001 From: Ricardo Rocha Date: Thu, 26 Oct 2017 17:29:37 +0200 Subject: [PATCH] [cern] do docker_ce config before enable_services Also rename DOCKER_CE to DOCKER_CE_VERSION in swarm templates --- .../drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml | 4 ++-- .../drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml index df2f243d0..f1eb338cc 100644 --- a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmmaster.yaml @@ -192,7 +192,7 @@ resources: "$CVMFS_ENABLED": {get_param: cvmfs_enabled} "$CVMFS_TAG": {get_param: cvmfs_tag} "$CVMFS_STORAGE_DRIVER": {get_param: cvmfs_storage_driver} - "$DOCKER_CE": {get_param: docker_ce_version} + "$DOCKER_CE_VERSION": {get_param: docker_ce_version} remove_docker_key: type: "OS::Heat::SoftwareConfig" @@ -303,13 +303,13 @@ resources: - config: {get_resource: configure_docker_storage} - config: {get_resource: add_docker_daemon_options} - config: {get_resource: write_docker_socket} + - config: {get_resource: configure_docker_ce_version} - config: {get_resource: add_proxy} - config: {get_resource: enable_services} - config: {get_resource: install_cern_certs} - config: {get_resource: write_swarm_master_service} - config: {get_resource: volume_service} - config: {get_resource: configure_docker_cvmfs} - - config: {get_resource: configure_docker_ce_version} - config: {get_resource: configure_docker_cvmfs_storage_driver} - config: {get_resource: configure_keytab} diff --git a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml index d21ed159c..f3d7e03d4 100644 --- a/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v2/templates/swarmnode.yaml @@ -187,7 +187,7 @@ resources: "$CVMFS_ENABLED": {get_param: cvmfs_enabled} "$CVMFS_TAG": {get_param: cvmfs_tag} "$CVMFS_STORAGE_DRIVER": {get_param: cvmfs_storage_driver} - "$DOCKER_CE": {get_param: docker_ce_version} + "$DOCKER_CE_VERSION": {get_param: docker_ce_version} remove_docker_key: type: "OS::Heat::SoftwareConfig" @@ -299,10 +299,10 @@ resources: - config: {get_resource: add_docker_daemon_options} - config: {get_resource: write_docker_socket} - config: {get_resource: add_proxy} + - config: {get_resource: configure_docker_ce_version} - config: {get_resource: enable_services} - config: {get_resource: install_cern_certs} - config: {get_resource: configure_docker_cvmfs} - - config: {get_resource: configure_docker_ce_version} - config: {get_resource: configure_docker_cvmfs_storage_driver} - config: {get_resource: write_swarm_worker_service} - config: {get_resource: volume_service} -- GitLab