openstack/tripleo-heat-templates
Code Issues Proposed changes

Revert "Matches updates for ceph-ansible variables name change"

Browse Source 
This reverts commit 1a194079f0.

Change-Id: Id3bcfd6b7c96bfa32c36f626960c19792e2293a7
This commit is contained in:
Giulio Fidente 2019-08-01 14:47:41 +00:00
parent 1da2a86623
commit 8242ae60c0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/ceph-ansible/ceph-base.yaml
View File

@ -271,6 +271,7 @@ resources:
type: json type: json
value: value:
vars: vars:
docker: true
containerized_deployment: true containerized_deployment: true
user_config: true user_config: true
ceph_stable: true ceph_stable: true
@ -281,9 +282,9 @@ resources:
generate_fsid: false generate_fsid: false
fsid: { get_param: CephClusterFSID } fsid: { get_param: CephClusterFSID }
cluster: { get_param: CephClusterName } cluster: { get_param: CephClusterName }
ceph_container_registry: {get_attr: [ContainerImageUrlParts, value, host]} ceph_docker_registry: {get_attr: [ContainerImageUrlParts, value, host]}
ceph_container_image: {get_attr: [ContainerImageUrlParts, value, image]} ceph_docker_image: {get_attr: [ContainerImageUrlParts, value, image]}
ceph_container_image_tag: {get_attr: [ContainerImageUrlParts, value, image_tag]} ceph_docker_image_tag: {get_attr: [ContainerImageUrlParts, value, image_tag]}
public_network: public_network:
list_join: list_join:
- ',' - ','

2
deployment/ceph-ansible/ceph-mgr.yaml
View File

@ -63,7 +63,7 @@ resources:
type: json type: json
value: value:
vars: 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_user: {get_param: CephDashboardAdminUser}
dashboard_admin_password: {get_param: CephDashboardAdminPassword} dashboard_admin_password: {get_param: CephDashboardAdminPassword}
dashboard_rgw_api_host: {get_param: [EndpointMap, CephRgwInternal, host]} dashboard_rgw_api_host: {get_param: [EndpointMap, CephRgwInternal, host]}