Merge "Add OctaviaAmphoraSshKeyDir for ssh key creation for Octavia"
This commit is contained in:
commit
d9026567f8
@ -23,7 +23,6 @@ resource_registry:
|
|||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
StandaloneExtraConfig:
|
StandaloneExtraConfig:
|
||||||
octavia::controller::connection_retry_interval: 10
|
octavia::controller::connection_retry_interval: 10
|
||||||
OctaviaAmphoraSshKeyFile: /home/zuul/.ssh/id_rsa.pub
|
|
||||||
OctaviaAmphoraImageFilename: /home/zuul/amphora.qcow2
|
OctaviaAmphoraImageFilename: /home/zuul/amphora.qcow2
|
||||||
OctaviaCaKeyPassphrase: 'upstreamci'
|
OctaviaCaKeyPassphrase: 'upstreamci'
|
||||||
OctaviaManageNovaFlavor: true
|
OctaviaManageNovaFlavor: true
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
heat_template_version: wallaby
|
heat_template_version: wallaby
|
||||||
{%- set octavia_standalone=[] -%}
|
|
||||||
{%- for role in roles if 'standalone' in role.tags -%}
|
|
||||||
{% if octavia_standalone.append('1') %}{% endif %}
|
|
||||||
{%- endfor %}
|
|
||||||
|
|
||||||
description: >
|
description: >
|
||||||
Configuration of Octavia as-a-service resources in the overcloud.
|
Configuration of Octavia as-a-service resources in the overcloud.
|
||||||
@ -74,14 +70,16 @@ parameters:
|
|||||||
description: SSH key name.
|
description: SSH key name.
|
||||||
OctaviaAmphoraSshKeyFile:
|
OctaviaAmphoraSshKeyFile:
|
||||||
type: string
|
type: string
|
||||||
{% if not octavia_standalone %}
|
|
||||||
default: ''
|
default: ''
|
||||||
{% endif %}
|
|
||||||
description: Public key file path. User will be able to SSH into amphorae
|
description: Public key file path. User will be able to SSH into amphorae
|
||||||
with the provided key. User may, in most cases, also elevate to root
|
with the provided key. User may, in most cases, also elevate to root
|
||||||
from user 'centos' (CentOS), 'ubuntu' (Ubuntu) or 'cloud-user' (RHEL)
|
from user 'centos' (CentOS), 'ubuntu' (Ubuntu) or 'cloud-user' (RHEL)
|
||||||
(depends on how amphora image was created). Logging in to amphorae
|
(depends on how amphora image was created). Logging in to amphorae
|
||||||
provides a convenient way to e.g. debug load balancing services.
|
provides a convenient way to e.g. debug load balancing services.
|
||||||
|
OctaviaAmphoraSshKeyDir:
|
||||||
|
type: string
|
||||||
|
default: '/etc/octavia/ssh'
|
||||||
|
description: Octavia generated SSH key directory.
|
||||||
NovaEnableRbdBackend:
|
NovaEnableRbdBackend:
|
||||||
default: false
|
default: false
|
||||||
description: Whether to enable the Rbd backend for Nova ephemeral storage.
|
description: Whether to enable the Rbd backend for Nova ephemeral storage.
|
||||||
@ -196,13 +194,6 @@ conditions:
|
|||||||
- raw
|
- raw
|
||||||
- get_param: NovaEnableRbdBackend
|
- get_param: NovaEnableRbdBackend
|
||||||
|
|
||||||
resources:
|
|
||||||
{% if not octavia_standalone %}
|
|
||||||
default_key_pair:
|
|
||||||
type: OS::Nova::KeyPair
|
|
||||||
external_id: default
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
description: Role data for the Octavia configuration service
|
description: Role data for the Octavia configuration service
|
||||||
@ -226,9 +217,7 @@ outputs:
|
|||||||
amp_hw_arch: { get_param: OctaviaAmphoraImageArchitecture }
|
amp_hw_arch: { get_param: OctaviaAmphoraImageArchitecture }
|
||||||
amp_ssh_key_name: { get_param: OctaviaAmphoraSshKeyName }
|
amp_ssh_key_name: { get_param: OctaviaAmphoraSshKeyName }
|
||||||
amp_ssh_key_path: { get_param: OctaviaAmphoraSshKeyFile }
|
amp_ssh_key_path: { get_param: OctaviaAmphoraSshKeyFile }
|
||||||
{% if not octavia_standalone %}
|
amp_ssh_key_dir: { get_param: OctaviaAmphoraSshKeyDir }
|
||||||
amp_ssh_key_data: { get_attr: [default_key_pair, public_key] }
|
|
||||||
{% endif %}
|
|
||||||
amp_to_raw: {if: [octavia_raw_image_check, true, false]}
|
amp_to_raw: {if: [octavia_raw_image_check, true, false]}
|
||||||
auth_username: { get_param: OctaviaUserName }
|
auth_username: { get_param: OctaviaUserName }
|
||||||
auth_password: { get_param: OctaviaPassword }
|
auth_password: { get_param: OctaviaPassword }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user