Browse Source

Merge "Migrate nova cron parameters to NovaApi service"

changes/94/787694/2
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
b397b0acfd
2 changed files with 154 additions and 154 deletions
  1. +154
    -2
      deployment/nova/nova-api-container-puppet.yaml
  2. +0
    -152
      deployment/nova/nova-base-puppet.yaml

+ 154
- 2
deployment/nova/nova-api-container-puppet.yaml View File

@ -98,6 +98,134 @@ parameters:
default: 1000
description: Max number of objects returned per API query
type: number
NovaCronPurgeShadowTablesMinute:
type: string
description: >
Cron to purge shadow tables - Minute
default: '0'
NovaCronPurgeShadowTablesHour:
type: string
description: >
Cron to purge shadow tables - Hour
default: '5'
NovaCronPurgeShadowTablesMonthday:
type: string
description: >
Cron to purge shadow tables - Month Day
default: '*'
NovaCronPurgeShadowTablesMonth:
type: string
description: >
Cron to purge shadow tables - Month
default: '*'
NovaCronPurgeShadowTablesWeekday:
type: string
description: >
Cron to purge shadow tables - Week Day
default: '*'
NovaCronPurgeShadowTablesUser:
type: string
description: >
Cron to purge shadow tables - User
default: 'nova'
NovaCronPurgeShadowTablesDestination:
type: string
description: >
Cron to purge shadow tables - Log destination
default: '/var/log/nova/nova-rowspurge.log'
NovaCronPurgeShadowTablesMaxDelay:
type: string
description: >
Cron to purge shadow tables - Max Delay
default: '3600'
NovaCronPurgeShadowTablesAge:
type: number
description: >
Cron to purge shadow tables - Age
This will define the retention policy when
purging the shadow tables in days.
0 means, purge data older than today in
shadow tables.
default: 14
NovaCronPurgeShadowTablesVerbose:
type: boolean
description: >
Cron to purge shadow tables - Verbose
default: false
NovaCronPurgeShadowTablesAllCells:
type: boolean
description: >
Cron to purge shadow tables - All cells
default: true
NovaCronArchiveDeleteRowsMinute:
type: string
description: >
Cron to move deleted instances to another table - Minute
default: '1'
NovaCronArchiveDeleteRowsHour:
type: string
description: >
Cron to move deleted instances to another table - Hour
default: '0'
NovaCronArchiveDeleteRowsMonthday:
type: string
description: >
Cron to move deleted instances to another table - Month Day
default: '*'
NovaCronArchiveDeleteRowsMonth:
type: string
description: >
Cron to move deleted instances to another table - Month
default: '*'
NovaCronArchiveDeleteRowsWeekday:
type: string
description: >
Cron to move deleted instances to another table - Week Day
default: '*'
NovaCronArchiveDeleteRowsMaxRows:
type: string
description: >
Cron to move deleted instances to another table - Max Rows
default: '1000'
NovaCronArchiveDeleteRowsUser:
type: string
description: >
Cron to move deleted instances to another table - User
default: 'nova'
NovaCronArchiveDeleteRowsDestination:
type: string
description: >
Cron to move deleted instances to another table - Log destination
default: '/var/log/nova/nova-rowsflush.log'
NovaCronArchiveDeleteRowsMaxDelay:
type: string
description: >
Cron to move deleted instances to another table - Max Delay
default: '3600'
NovaCronArchiveDeleteRowsUntilComplete:
type: boolean
description: >
Cron to move deleted instances to another table - Until complete
default: true
NovaCronArchiveDeleteRowsPurge:
type: boolean
description: >
Purge shadow tables immediately after scheduled archiving
default: false
NovaCronArchiveDeleteAllCells:
type: boolean
description: >
Archive deleted instances from all cells
default: true
NovaCronArchiveDeleteRowsAge:
type: number
description: >
Cron to archive deleted instances - Age
This will define the retention policy when
archiving the deleted instances entries in days.
0 means, purge data older than today in
shadow tables.
default: 90
parameter_groups:
- label: deprecated
@ -240,10 +368,34 @@ outputs:
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::instance_name_template: {get_param: InstanceNameTemplate}
nova_enable_db_purge: {get_param: NovaEnableDBPurge}
nova_enable_db_archive: {get_param: NovaEnableDBArchive}
nova::policy::policies: {get_param: NovaApiPolicies}
nova::api::allow_resize_to_same_host: {get_param: NovaAllowResizeToSameHost}
nova_enable_db_purge: {get_param: NovaEnableDBPurge}
nova::cron::purge_shadow_tables::minute: {get_param: NovaCronPurgeShadowTablesMinute}
nova::cron::purge_shadow_tables::hour: {get_param: NovaCronPurgeShadowTablesHour}
nova::cron::purge_shadow_tables::monthday: {get_param: NovaCronPurgeShadowTablesMonthday}
nova::cron::purge_shadow_tables::month: {get_param: NovaCronPurgeShadowTablesMonth}
nova::cron::purge_shadow_tables::weekday: {get_param: NovaCronPurgeShadowTablesWeekday}
nova::cron::purge_shadow_tables::user: {get_param: NovaCronPurgeShadowTablesUser}
nova::cron::purge_shadow_tables::destination: {get_param: NovaCronPurgeShadowTablesDestination}
nova::cron::purge_shadow_tables::maxdelay: {get_param: NovaCronPurgeShadowTablesMaxDelay}
nova::cron::purge_shadow_tables::age: {get_param: NovaCronPurgeShadowTablesAge}
nova::cron::purge_shadow_tables::verbose: {get_param: NovaCronPurgeShadowTablesVerbose}
nova::cron::purge_shadow_tables::all_cells: {get_param: NovaCronPurgeShadowTablesAllCells}
nova_enable_db_archive: {get_param: NovaEnableDBArchive}
nova::cron::archive_deleted_rows::minute: {get_param: NovaCronArchiveDeleteRowsMinute}
nova::cron::archive_deleted_rows::hour: {get_param: NovaCronArchiveDeleteRowsHour}
nova::cron::archive_deleted_rows::monthday: {get_param: NovaCronArchiveDeleteRowsMonthday}
nova::cron::archive_deleted_rows::month: {get_param: NovaCronArchiveDeleteRowsMonth}
nova::cron::archive_deleted_rows::weekday: {get_param: NovaCronArchiveDeleteRowsWeekday}
nova::cron::archive_deleted_rows::max_rows: {get_param: NovaCronArchiveDeleteRowsMaxRows}
nova::cron::archive_deleted_rows::user: {get_param: NovaCronArchiveDeleteRowsUser}
nova::cron::archive_deleted_rows::destination: {get_param: NovaCronArchiveDeleteRowsDestination}
nova::cron::archive_deleted_rows::maxdelay: {get_param: NovaCronArchiveDeleteRowsMaxDelay}
nova::cron::archive_deleted_rows::until_complete: {get_param: NovaCronArchiveDeleteRowsUntilComplete}
nova::cron::archive_deleted_rows::purge: {get_param: NovaCronArchiveDeleteRowsPurge}
nova::cron::archive_deleted_rows::all_cells: {get_param: NovaCronArchiveDeleteAllCells}
nova::cron::archive_deleted_rows::age: {get_param: NovaCronArchiveDeleteRowsAge}
-
if:
- nova_workers_zero


+ 0
- 152
deployment/nova/nova-base-puppet.yaml View File

@ -83,134 +83,6 @@ parameters:
type: string
description: Nova Compute upgrade level
default: ''
NovaCronArchiveDeleteRowsMinute:
type: string
description: >
Cron to move deleted instances to another table - Minute
default: '1'
NovaCronArchiveDeleteRowsHour:
type: string
description: >
Cron to move deleted instances to another table - Hour
default: '0'
NovaCronArchiveDeleteRowsMonthday:
type: string
description: >
Cron to move deleted instances to another table - Month Day
default: '*'
NovaCronArchiveDeleteRowsMonth:
type: string
description: >
Cron to move deleted instances to another table - Month
default: '*'
NovaCronArchiveDeleteRowsWeekday:
type: string
description: >
Cron to move deleted instances to another table - Week Day
default: '*'
NovaCronArchiveDeleteRowsMaxRows:
type: string
description: >
Cron to move deleted instances to another table - Max Rows
default: '1000'
NovaCronArchiveDeleteRowsUser:
type: string
description: >
Cron to move deleted instances to another table - User
default: 'nova'
NovaCronArchiveDeleteRowsDestination:
type: string
description: >
Cron to move deleted instances to another table - Log destination
default: '/var/log/nova/nova-rowsflush.log'
NovaCronArchiveDeleteRowsMaxDelay:
type: string
description: >
Cron to move deleted instances to another table - Max Delay
default: '3600'
NovaCronArchiveDeleteRowsUntilComplete:
type: boolean
description: >
Cron to move deleted instances to another table - Until complete
default: true
NovaCronArchiveDeleteRowsPurge:
type: boolean
description: >
Purge shadow tables immediately after scheduled archiving
default: false
NovaCronArchiveDeleteAllCells:
type: boolean
description: >
Archive deleted instances from all cells
default: true
NovaCronArchiveDeleteRowsAge:
type: number
description: >
Cron to archive deleted instances - Age
This will define the retention policy when
archiving the deleted instances entries in days.
0 means, purge data older than today in
shadow tables.
default: 90
NovaCronPurgeShadowTablesMinute:
type: string
description: >
Cron to purge shadow tables - Minute
default: '0'
NovaCronPurgeShadowTablesHour:
type: string
description: >
Cron to purge shadow tables - Hour
default: '5'
NovaCronPurgeShadowTablesMonthday:
type: string
description: >
Cron to purge shadow tables - Month Day
default: '*'
NovaCronPurgeShadowTablesMonth:
type: string
description: >
Cron to purge shadow tables - Month
default: '*'
NovaCronPurgeShadowTablesWeekday:
type: string
description: >
Cron to purge shadow tables - Week Day
default: '*'
NovaCronPurgeShadowTablesUser:
type: string
description: >
Cron to purge shadow tables - User
default: 'nova'
NovaCronPurgeShadowTablesDestination:
type: string
description: >
Cron to purge shadow tables - Log destination
default: '/var/log/nova/nova-rowspurge.log'
NovaCronPurgeShadowTablesMaxDelay:
type: string
description: >
Cron to purge shadow tables - Max Delay
default: '3600'
NovaCronPurgeShadowTablesAge:
type: number
description: >
Cron to purge shadow tables - Age
This will define the retention policy when
purging the shadow tables in days.
0 means, purge data older than today in
shadow tables.
default: 14
NovaCronPurgeShadowTablesVerbose:
type: boolean
description: >
Cron to purge shadow tables - Verbose
default: false
NovaCronPurgeShadowTablesAllCells:
type: boolean
description: >
Cron to purge shadow tables - All cells
default: true
NovaOVSDBConnection:
type: string
description: OVS DB connection string to used by Nova
@ -317,30 +189,6 @@ outputs:
nova::db::database_db_max_retries: -1
nova::db::database_max_retries: -1
nova::network::neutron::ovs_bridge: {get_param: NovaOVSBridge}
nova::cron::archive_deleted_rows::minute: {get_param: NovaCronArchiveDeleteRowsMinute}
nova::cron::archive_deleted_rows::hour: {get_param: NovaCronArchiveDeleteRowsHour}
nova::cron::archive_deleted_rows::monthday: {get_param: NovaCronArchiveDeleteRowsMonthday}
nova::cron::archive_deleted_rows::month: {get_param: NovaCronArchiveDeleteRowsMonth}
nova::cron::archive_deleted_rows::weekday: {get_param: NovaCronArchiveDeleteRowsWeekday}
nova::cron::archive_deleted_rows::max_rows: {get_param: NovaCronArchiveDeleteRowsMaxRows}
nova::cron::archive_deleted_rows::user: {get_param: NovaCronArchiveDeleteRowsUser}
nova::cron::archive_deleted_rows::destination: {get_param: NovaCronArchiveDeleteRowsDestination}
nova::cron::archive_deleted_rows::maxdelay: {get_param: NovaCronArchiveDeleteRowsMaxDelay}
nova::cron::archive_deleted_rows::until_complete: {get_param: NovaCronArchiveDeleteRowsUntilComplete}
nova::cron::archive_deleted_rows::purge: {get_param: NovaCronArchiveDeleteRowsPurge}
nova::cron::archive_deleted_rows::all_cells: {get_param: NovaCronArchiveDeleteAllCells}
nova::cron::archive_deleted_rows::age: {get_param: NovaCronArchiveDeleteRowsAge}
nova::cron::purge_shadow_tables::minute: {get_param: NovaCronPurgeShadowTablesMinute}
nova::cron::purge_shadow_tables::hour: {get_param: NovaCronPurgeShadowTablesHour}
nova::cron::purge_shadow_tables::monthday: {get_param: NovaCronPurgeShadowTablesMonthday}
nova::cron::purge_shadow_tables::month: {get_param: NovaCronPurgeShadowTablesMonth}
nova::cron::purge_shadow_tables::weekday: {get_param: NovaCronPurgeShadowTablesWeekday}
nova::cron::purge_shadow_tables::user: {get_param: NovaCronPurgeShadowTablesUser}
nova::cron::purge_shadow_tables::destination: {get_param: NovaCronPurgeShadowTablesDestination}
nova::cron::purge_shadow_tables::maxdelay: {get_param: NovaCronPurgeShadowTablesMaxDelay}
nova::cron::purge_shadow_tables::age: {get_param: NovaCronPurgeShadowTablesAge}
nova::cron::purge_shadow_tables::verbose: {get_param: NovaCronPurgeShadowTablesVerbose}
nova::cron::purge_shadow_tables::all_cells: {get_param: NovaCronPurgeShadowTablesAllCells}
nova::compute::sync_power_state_interval: {get_param: NovaSyncPowerStateInterval}
nova_is_additional_cell: {get_param: NovaAdditionalCell}
nova::cross_az_attach: {get_param: NovaCrossAZAttach}


Loading…
Cancel
Save