Merge "Re-add amphora flavor management settings"
This commit is contained in:
commit
b381a7fefa
|
@ -69,6 +69,17 @@ parameters:
|
||||||
e.g. { octavia-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
|
e.g. { octavia-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
|
||||||
default: {}
|
default: {}
|
||||||
type: json
|
type: json
|
||||||
|
OctaviaFlavorProperties:
|
||||||
|
default:
|
||||||
|
ram : '1024'
|
||||||
|
disk : '3'
|
||||||
|
vcpus: '1'
|
||||||
|
description: Dictionary describing the nova flavor for amphora.
|
||||||
|
type: json
|
||||||
|
OctaviaManageNovaFlavor:
|
||||||
|
default: true
|
||||||
|
description: Configure the nova flavor for the amphora.
|
||||||
|
type: boolean
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
|
|
||||||
|
@ -119,6 +130,8 @@ outputs:
|
||||||
octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||||
octavia::keystone::authtoken::project_name: {get_param: OctaviaProjectName}
|
octavia::keystone::authtoken::project_name: {get_param: OctaviaProjectName}
|
||||||
octavia::keystone::authtoken::password: {get_param: OctaviaPassword}
|
octavia::keystone::authtoken::password: {get_param: OctaviaPassword}
|
||||||
|
octavia::worker::manage_nova_flavor: {get_param: OctaviaManageNovaFlavor}
|
||||||
|
octavia::worker::nova_flavor_config: {get_param: OctaviaFlavorProperties}
|
||||||
octavia::api::sync_db: true
|
octavia::api::sync_db: true
|
||||||
octavia::api::service_name: 'httpd'
|
octavia::api::service_name: 'httpd'
|
||||||
octavia::wsgi::apache::ssl: {get_param: EnableInternalTLS}
|
octavia::wsgi::apache::ssl: {get_param: EnableInternalTLS}
|
||||||
|
@ -205,8 +218,8 @@ outputs:
|
||||||
step_5:
|
step_5:
|
||||||
config_volume: octavia
|
config_volume: octavia
|
||||||
puppet_tags: nova_flavor
|
puppet_tags: nova_flavor
|
||||||
step_config:
|
step_config: |
|
||||||
get_attr: [OctaviaWorker, role_data, step_config]
|
include ::octavia::worker
|
||||||
config_image: {get_param: DockerOctaviaConfigImage}
|
config_image: {get_param: DockerOctaviaConfigImage}
|
||||||
volumes:
|
volumes:
|
||||||
- /var/lib/config-data/puppet-generated/nova/etc/nova:/etc/nova:ro
|
- /var/lib/config-data/puppet-generated/nova/etc/nova:/etc/nova:ro
|
||||||
|
|
Loading…
Reference in New Issue