Move ceph-ansible required variables in the main group
ceph-ansible v4.0.16 introduced some changes to double check
the ceph dashboard and grafana passwords exist, are properly
generated and are not defaults values.
However, the constraint introduced forced tripleo to put
these variables in all.yaml instead of distributing them on
the related roles (mgr and grafana-server).
This change moves these variables in ceph-base, since here
we're able to generate the ceph_ansible_group_vars_all.
Closes-Bug: #1867973
Change-Id: I7a1ce4ba4ac358733747e9301038d0245ae08016
(cherry picked from commit ebe1a40fb9
)
This commit is contained in:
parent
0395b6f55d
commit
52a3f896de
|
@ -17,6 +17,14 @@ parameters:
|
|||
DefaultPasswords:
|
||||
default: {}
|
||||
type: json
|
||||
CephDashboardAdminPassword:
|
||||
description: Admin password for the dashboard component
|
||||
type: string
|
||||
hidden: true
|
||||
CephGrafanaAdminPassword:
|
||||
description: Admin password for grafana component
|
||||
type: string
|
||||
hidden: true
|
||||
RoleName:
|
||||
default: ''
|
||||
description: Role name on which the service is applied
|
||||
|
@ -327,6 +335,7 @@ parameter_groups:
|
|||
conditions:
|
||||
deprecated_data_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSDataPoolPGNum}, 128]}}
|
||||
deprecated_metadata_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSMetadataPoolPGNum}, 128]}}
|
||||
dashboard_is_enabled: {equals: [{get_param: CephEnableDashboard}, true]}
|
||||
custom_registry_host:
|
||||
yaql:
|
||||
data: {get_param: ContainerCephDaemonImage}
|
||||
|
@ -612,7 +621,14 @@ outputs:
|
|||
- name: set ceph-ansible facts
|
||||
set_fact:
|
||||
blacklisted_hostnames: {get_param: DeploymentServerBlacklist}
|
||||
ceph_ansible_group_vars_all: {get_attr: [CephBaseAnsibleVars, value, vars]}
|
||||
ceph_ansible_group_vars_all:
|
||||
if:
|
||||
- dashboard_is_enabled
|
||||
- map_merge:
|
||||
- {get_attr: [CephBaseAnsibleVars, value, vars]}
|
||||
- dashboard_admin_password: {get_param: CephDashboardAdminPassword}
|
||||
- grafana_admin_password: {get_param: CephGrafanaAdminPassword}
|
||||
- {get_attr: [CephBaseAnsibleVars, value, vars]}
|
||||
ceph_ansible_extra_vars:
|
||||
map_merge:
|
||||
- {get_param: CephAnsibleExtraConfig}
|
||||
|
|
|
@ -34,10 +34,6 @@ parameters:
|
|||
default: 'admin'
|
||||
description: Admin user for grafana component
|
||||
type: string
|
||||
CephGrafanaAdminPassword:
|
||||
description: Admin password for grafana component
|
||||
type: string
|
||||
hidden: true
|
||||
GrafanaPlugins:
|
||||
default: ['vonage-status-panel', 'grafana-piechart-panel']
|
||||
type: comma_delimited_list
|
||||
|
@ -88,7 +84,6 @@ resources:
|
|||
value:
|
||||
vars:
|
||||
grafana_admin_user: {get_param: CephGrafanaAdminUser}
|
||||
grafana_admin_password: {get_param: CephGrafanaAdminPassword}
|
||||
grafana_container_image: {get_param: GrafanaContainerImage}
|
||||
grafana_dashboards_path: {get_param: GrafanaDashboardsPath}
|
||||
grafana_datasource: {get_param: GrafanaDataSource}
|
||||
|
|
|
@ -34,10 +34,6 @@ parameters:
|
|||
default: 'admin'
|
||||
description: Admin user for the dashboard component
|
||||
type: string
|
||||
CephDashboardAdminPassword:
|
||||
description: Admin password for the dashboard component
|
||||
type: string
|
||||
hidden: true
|
||||
CephEnableDashboard:
|
||||
type: boolean
|
||||
default: false
|
||||
|
@ -74,7 +70,6 @@ resources:
|
|||
vars:
|
||||
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]}
|
||||
dashboard_rgw_api_port: {get_param: [EndpointMap, CephRgwInternal, port]}
|
||||
dashboard_rgw_api_scheme: {get_param: [EndpointMap, CephRgwInternal, protocol]}
|
||||
|
|
Loading…
Reference in New Issue