Merge "Move ceph-ansible required variables in the main group" into stable/train
This commit is contained in:
commit
0e42a602a9
|
@ -17,6 +17,14 @@ parameters:
|
||||||
DefaultPasswords:
|
DefaultPasswords:
|
||||||
default: {}
|
default: {}
|
||||||
type: json
|
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:
|
RoleName:
|
||||||
default: ''
|
default: ''
|
||||||
description: Role name on which the service is applied
|
description: Role name on which the service is applied
|
||||||
|
@ -327,6 +335,7 @@ parameter_groups:
|
||||||
conditions:
|
conditions:
|
||||||
deprecated_data_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSDataPoolPGNum}, 128]}}
|
deprecated_data_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSDataPoolPGNum}, 128]}}
|
||||||
deprecated_metadata_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSMetadataPoolPGNum}, 128]}}
|
deprecated_metadata_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSMetadataPoolPGNum}, 128]}}
|
||||||
|
dashboard_is_enabled: {equals: [{get_param: CephEnableDashboard}, true]}
|
||||||
custom_registry_host:
|
custom_registry_host:
|
||||||
yaql:
|
yaql:
|
||||||
data: {get_param: ContainerCephDaemonImage}
|
data: {get_param: ContainerCephDaemonImage}
|
||||||
|
@ -612,7 +621,14 @@ outputs:
|
||||||
- name: set ceph-ansible facts
|
- name: set ceph-ansible facts
|
||||||
set_fact:
|
set_fact:
|
||||||
blacklisted_hostnames: {get_param: DeploymentServerBlacklist}
|
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:
|
ceph_ansible_extra_vars:
|
||||||
map_merge:
|
map_merge:
|
||||||
- {get_param: CephAnsibleExtraConfig}
|
- {get_param: CephAnsibleExtraConfig}
|
||||||
|
|
|
@ -34,10 +34,6 @@ parameters:
|
||||||
default: 'admin'
|
default: 'admin'
|
||||||
description: Admin user for grafana component
|
description: Admin user for grafana component
|
||||||
type: string
|
type: string
|
||||||
CephGrafanaAdminPassword:
|
|
||||||
description: Admin password for grafana component
|
|
||||||
type: string
|
|
||||||
hidden: true
|
|
||||||
GrafanaPlugins:
|
GrafanaPlugins:
|
||||||
default: ['vonage-status-panel', 'grafana-piechart-panel']
|
default: ['vonage-status-panel', 'grafana-piechart-panel']
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
|
@ -88,7 +84,6 @@ resources:
|
||||||
value:
|
value:
|
||||||
vars:
|
vars:
|
||||||
grafana_admin_user: {get_param: CephGrafanaAdminUser}
|
grafana_admin_user: {get_param: CephGrafanaAdminUser}
|
||||||
grafana_admin_password: {get_param: CephGrafanaAdminPassword}
|
|
||||||
grafana_container_image: {get_param: GrafanaContainerImage}
|
grafana_container_image: {get_param: GrafanaContainerImage}
|
||||||
grafana_dashboards_path: {get_param: GrafanaDashboardsPath}
|
grafana_dashboards_path: {get_param: GrafanaDashboardsPath}
|
||||||
grafana_datasource: {get_param: GrafanaDataSource}
|
grafana_datasource: {get_param: GrafanaDataSource}
|
||||||
|
|
|
@ -34,10 +34,6 @@ parameters:
|
||||||
default: 'admin'
|
default: 'admin'
|
||||||
description: Admin user for the dashboard component
|
description: Admin user for the dashboard component
|
||||||
type: string
|
type: string
|
||||||
CephDashboardAdminPassword:
|
|
||||||
description: Admin password for the dashboard component
|
|
||||||
type: string
|
|
||||||
hidden: true
|
|
||||||
CephEnableDashboard:
|
CephEnableDashboard:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
|
@ -74,7 +70,6 @@ resources:
|
||||||
vars:
|
vars:
|
||||||
ceph_mgr_docker_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_rgw_api_host: {get_param: [EndpointMap, CephRgwInternal, host]}
|
dashboard_rgw_api_host: {get_param: [EndpointMap, CephRgwInternal, host]}
|
||||||
dashboard_rgw_api_port: {get_param: [EndpointMap, CephRgwInternal, port]}
|
dashboard_rgw_api_port: {get_param: [EndpointMap, CephRgwInternal, port]}
|
||||||
dashboard_rgw_api_scheme: {get_param: [EndpointMap, CephRgwInternal, protocol]}
|
dashboard_rgw_api_scheme: {get_param: [EndpointMap, CephRgwInternal, protocol]}
|
||||||
|
|
Loading…
Reference in New Issue