Revert "Matches updates for ceph-ansible variables name change"
This reverts commit 1a194079f0
.
Change-Id: Id3bcfd6b7c96bfa32c36f626960c19792e2293a7
This commit is contained in:
parent
1da2a86623
commit
8242ae60c0
deployment/ceph-ansible
@ -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:
|
||||
- ','
|
||||
|
@ -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]}
|
||||
|
Loading…
Reference in New Issue
Block a user