Merge "[train,ussuri] Set cinder's __DEFAULT__ vol type description" into stable/train
This commit is contained in:
commit
aa62c07b11
|
@ -58,6 +58,11 @@ parameters:
|
||||||
default: tripleo
|
default: tripleo
|
||||||
description: The name of Cinder's default volume type.
|
description: The name of Cinder's default volume type.
|
||||||
type: string
|
type: string
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "[a-zA-Z0-9]+"
|
||||||
|
description: >
|
||||||
|
The default volume type must be at least 1 character and contain only
|
||||||
|
letters and numbers.
|
||||||
CinderEnableDBPurge:
|
CinderEnableDBPurge:
|
||||||
default: true
|
default: true
|
||||||
description: |
|
description: |
|
||||||
|
@ -497,7 +502,7 @@ outputs:
|
||||||
state: absent
|
state: absent
|
||||||
when:
|
when:
|
||||||
- step|int == 4
|
- step|int == 4
|
||||||
- name: Manage Cinder Volume Type
|
- name: Manage Cinder's default volume type
|
||||||
become: true
|
become: true
|
||||||
vars:
|
vars:
|
||||||
default_volume_type: {get_param: CinderDefaultVolumeType}
|
default_volume_type: {get_param: CinderDefaultVolumeType}
|
||||||
|
@ -510,6 +515,13 @@ outputs:
|
||||||
if ! openstack volume type show "{{ default_volume_type }}"; then
|
if ! openstack volume type show "{{ default_volume_type }}"; then
|
||||||
openstack volume type create --public "{{ default_volume_type }}"
|
openstack volume type create --public "{{ default_volume_type }}"
|
||||||
fi
|
fi
|
||||||
|
eval $(openstack volume type show __DEFAULT__ -f shell -c id -c description)
|
||||||
|
if [ -n "$id" ]; then
|
||||||
|
tripleo_descr="For internal use, '{{ default_volume_type }}' is the default volume type"
|
||||||
|
if [ "$description" != "$tripleo_descr" ]; then
|
||||||
|
openstack volume type set $id --description "$tripleo_descr"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
args:
|
args:
|
||||||
executable: /bin/bash
|
executable: /bin/bash
|
||||||
changed_when: false
|
changed_when: false
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
other:
|
||||||
|
- |
|
||||||
|
The description of cinder's own __DEFAULT__ volume type is updated to
|
||||||
|
indicate the actual default volume type is the one established by the
|
||||||
|
CinderDefaultVolumeType parameter.
|
Loading…
Reference in New Issue