From 1a194079f0d5a79d620bb39d126f0bfe8cad2d58 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Wed, 29 May 2019 09:53:30 +0200 Subject: [PATCH] Matches updates for ceph-ansible variables name change Replaces some ceph-ansible variables name to match the changes introduced with PR #4002 Change-Id: Iadde822bf362c90098394930bf158ba905fb32de --- deployment/ceph-ansible/ceph-base.yaml | 7 +++---- deployment/ceph-ansible/ceph-mgr.yaml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml index b0cc3f2def..1ec89fece2 100644 --- a/deployment/ceph-ansible/ceph-base.yaml +++ b/deployment/ceph-ansible/ceph-base.yaml @@ -244,7 +244,6 @@ resources: type: json value: vars: - docker: true containerized_deployment: true user_config: true ceph_stable: true @@ -255,9 +254,9 @@ resources: generate_fsid: false fsid: { get_param: CephClusterFSID } cluster: { get_param: CephClusterName } - 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]} + 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]} public_network: list_join: - ',' diff --git a/deployment/ceph-ansible/ceph-mgr.yaml b/deployment/ceph-ansible/ceph-mgr.yaml index 857104a22f..6954cc9109 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_docker_extra_env: '-e MGR_DASHBOARD=0' + ceph_mgr_container_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]}