From 8242ae60c0ad8641491492f2241b985c44eaf8a8 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 1 Aug 2019 14:47:41 +0000 Subject: [PATCH] Revert "Matches updates for ceph-ansible variables name change" This reverts commit 1a194079f0d5a79d620bb39d126f0bfe8cad2d58. Change-Id: Id3bcfd6b7c96bfa32c36f626960c19792e2293a7 --- deployment/ceph-ansible/ceph-base.yaml | 7 ++++--- deployment/ceph-ansible/ceph-mgr.yaml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml index d894608295..82574e1411 100644 --- a/deployment/ceph-ansible/ceph-base.yaml +++ b/deployment/ceph-ansible/ceph-base.yaml @@ -271,6 +271,7 @@ resources: type: json value: vars: + docker: true containerized_deployment: true user_config: true ceph_stable: true @@ -281,9 +282,9 @@ resources: generate_fsid: false fsid: { get_param: CephClusterFSID } cluster: { get_param: CephClusterName } - ceph_container_registry: {get_attr: [ContainerImageUrlParts, value, host]} - ceph_container_image: {get_attr: [ContainerImageUrlParts, value, image]} - ceph_container_image_tag: {get_attr: [ContainerImageUrlParts, value, image_tag]} + ceph_docker_registry: {get_attr: [ContainerImageUrlParts, value, host]} + ceph_docker_image: {get_attr: [ContainerImageUrlParts, value, image]} + ceph_docker_image_tag: {get_attr: [ContainerImageUrlParts, value, image_tag]} public_network: list_join: - ',' diff --git a/deployment/ceph-ansible/ceph-mgr.yaml b/deployment/ceph-ansible/ceph-mgr.yaml index 6954cc9109..857104a22f 100644 --- a/deployment/ceph-ansible/ceph-mgr.yaml +++ b/deployment/ceph-ansible/ceph-mgr.yaml @@ -63,7 +63,7 @@ resources: type: json value: vars: - ceph_mgr_container_extra_env: '-e MGR_DASHBOARD=0' + ceph_mgr_docker_extra_env: '-e MGR_DASHBOARD=0' dashboard_admin_user: {get_param: CephDashboardAdminUser} dashboard_admin_password: {get_param: CephDashboardAdminPassword} dashboard_rgw_api_host: {get_param: [EndpointMap, CephRgwInternal, host]}