Merge "Role specific container support"
This commit is contained in:
Zuul
Gerrit Code Review
commit
4bdaa20405
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerAodhApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerAodhConfigImage:
|
||||
description: The container image to use for the aodh config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -133,6 +137,20 @@ resources:
|
|||
RoleParameters: {get_param: RoleParameters}
|
||||
EnableInternalTLS: {get_param: EnableInternalTLS}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerAodhApiImage: ContainerAodhApiImage
|
||||
ContainerAodhConfigImage: ContainerAodhConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerAodhApiImage: {get_param: ContainerAodhApiImage}
|
||||
ContainerAodhConfigImage: {get_param: ContainerAodhConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the aodh API role.
|
||||
|
|
@ -214,7 +232,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::aodh::api"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerAodhConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerAodhConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/aodh_api.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -254,7 +272,7 @@ outputs:
|
|||
# db sync runs before permissions set by kolla_config
|
||||
step_2:
|
||||
aodh_init_log:
|
||||
image: &aodh_api_image {get_param: ContainerAodhApiImage}
|
||||
image: &aodh_api_image {get_attr: [RoleParametersValue, value, ContainerAodhApiImage]}
|
||||
net: none
|
||||
user: root
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerAodhEvaluatorImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerAodhConfigImage:
|
||||
description: The container image to use for the aodh config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -54,6 +58,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerAodhEvaluatorImage: ContainerAodhEvaluatorImage
|
||||
ContainerAodhConfigImage: ContainerAodhConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerAodhEvaluatorImage: {get_param: ContainerAodhEvaluatorImage}
|
||||
ContainerAodhConfigImage: {get_param: ContainerAodhConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Aodh API role.
|
||||
|
|
@ -72,7 +90,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::aodh::evaluator"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerAodhConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerAodhConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/aodh_evaluator.json:
|
||||
command: /usr/bin/aodh-evaluator
|
||||
|
|
@ -88,7 +106,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
aodh_evaluator:
|
||||
image: {get_param: ContainerAodhEvaluatorImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerAodhEvaluatorImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerAodhListenerImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerAodhConfigImage:
|
||||
description: The container image to use for the aodh config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -54,6 +58,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerAodhListenerImage: ContainerAodhListenerImage
|
||||
ContainerAodhConfigImage: ContainerAodhConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerAodhListenerImage: {get_param: ContainerAodhListenerImage}
|
||||
ContainerAodhConfigImage: {get_param: ContainerAodhConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Aodh API role.
|
||||
|
|
@ -73,7 +91,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::aodh::listener"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerAodhConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerAodhConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/aodh_listener.json:
|
||||
command: /usr/bin/aodh-listener
|
||||
|
|
@ -89,7 +107,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
aodh_listener:
|
||||
image: {get_param: ContainerAodhListenerImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerAodhListenerImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerAodhNotifierImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerAodhConfigImage:
|
||||
description: The container image to use for the aodh config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -54,6 +58,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerAodhNotifierImage: ContainerAodhNotifierImage
|
||||
ContainerAodhConfigImage: ContainerAodhConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerAodhNotifierImage: {get_param: ContainerAodhNotifierImage}
|
||||
ContainerAodhConfigImage: {get_param: ContainerAodhConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Aodh API role.
|
||||
|
|
@ -73,7 +91,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::aodh::notifier"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerAodhConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerAodhConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/aodh_notifier.json:
|
||||
command: /usr/bin/aodh-notifier
|
||||
|
|
@ -89,7 +107,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
aodh_notifier:
|
||||
image: {get_param: ContainerAodhNotifierImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerAodhNotifierImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,15 +7,23 @@ parameters:
|
|||
ContainerBarbicanApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerBarbicanConfigImage:
|
||||
description: The container image to use for the barbican config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerBarbicanKeystoneListenerImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerBarbicanWorkerImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -193,6 +201,24 @@ resources:
|
|||
properties:
|
||||
EndpointMap: {get_param: EndpointMap}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerBarbicanApiImage: ContainerBarbicanApiImage
|
||||
ContainerBarbicanConfigImage: ContainerBarbicanConfigImage
|
||||
ContainerBarbicanKeystoneListenerImage: ContainerBarbicanKeystoneListenerImage
|
||||
ContainerBarbicanWorkerImage: ContainerBarbicanWorkerImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerBarbicanApiImage: {get_param: ContainerBarbicanApiImage}
|
||||
ContainerBarbicanConfigImage: {get_param: ContainerBarbicanConfigImage}
|
||||
ContainerBarbicanKeystoneListenerImage: {get_param: ContainerBarbicanKeystoneListenerImage}
|
||||
ContainerBarbicanWorkerImage: {get_param: ContainerBarbicanWorkerImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Barbican API role.
|
||||
|
|
@ -300,7 +326,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::barbican::api"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerBarbicanConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerBarbicanConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/barbican_api.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -553,7 +579,7 @@ outputs:
|
|||
- if:
|
||||
- {get_param: BarbicanPkcs11CryptoATOSEnabled}
|
||||
- barbican_init_atos_directory:
|
||||
image: &barbican_api_image {get_param: ContainerBarbicanApiImage}
|
||||
image: &barbican_api_image {get_attr: [RoleParametersValue, value, ContainerBarbicanApiImage]}
|
||||
net: host
|
||||
user: root
|
||||
volumes:
|
||||
|
|
@ -727,7 +753,7 @@ outputs:
|
|||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||
- barbican_keystone_listener:
|
||||
start_order: 6
|
||||
image: {get_param: ContainerBarbicanKeystoneListenerImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerBarbicanKeystoneListenerImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -743,7 +769,7 @@ outputs:
|
|||
environment: *kolla_env
|
||||
- barbican_worker:
|
||||
start_order: 7
|
||||
image: {get_param: ContainerBarbicanWorkerImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerBarbicanWorkerImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCeilometerCentralImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCeilometerConfigImage:
|
||||
description: The container image to use for the ceilometer config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
CeilometerAgentCentralLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -67,6 +71,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCeilometerCentralImage: ContainerCeilometerCentralImage
|
||||
ContainerCeilometerConfigImage: ContainerCeilometerConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCeilometerCentralImage: {get_param: ContainerCeilometerCentralImage}
|
||||
ContainerCeilometerConfigImage: {get_param: ContainerCeilometerConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Ceilometer Agent Central role.
|
||||
|
|
@ -98,7 +116,7 @@ outputs:
|
|||
puppet_tags: ceilometer_config
|
||||
step_config: |
|
||||
include tripleo::profile::base::ceilometer::agent::polling
|
||||
config_image: {get_param: ContainerCeilometerConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCeilometerConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/ceilometer_agent_central.json:
|
||||
command: /usr/bin/ceilometer-polling --polling-namespaces central --logfile /var/log/ceilometer/central.log
|
||||
|
|
@ -114,7 +132,7 @@ outputs:
|
|||
step_3:
|
||||
ceilometer_init_log:
|
||||
start_order: 0
|
||||
image: &ceilometer_agent_central_image {get_param: ContainerCeilometerCentralImage}
|
||||
image: &ceilometer_agent_central_image {get_attr: [RoleParametersValue, value, ContainerCeilometerCentralImage]}
|
||||
net: none
|
||||
user: root
|
||||
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCeilometerComputeImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCeilometerConfigImage:
|
||||
description: The container image to use for the ceilometer config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -60,6 +64,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCeilometerComputeImage: ContainerCeilometerComputeImage
|
||||
ContainerCeilometerConfigImage: ContainerCeilometerConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCeilometerComputeImage: {get_param: ContainerCeilometerComputeImage}
|
||||
ContainerCeilometerConfigImage: {get_param: ContainerCeilometerConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Ceilometer Agent Compute role.
|
||||
|
|
@ -80,7 +98,7 @@ outputs:
|
|||
puppet_tags: ceilometer_config
|
||||
step_config:
|
||||
include tripleo::profile::base::ceilometer::agent::polling
|
||||
config_image: {get_param: ContainerCeilometerConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCeilometerConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/ceilometer_agent_compute.json:
|
||||
command: /usr/bin/ceilometer-polling --polling-namespaces compute --logfile /var/log/ceilometer/compute.log
|
||||
|
|
@ -92,7 +110,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
ceilometer_agent_compute:
|
||||
image: {get_param: ContainerCeilometerComputeImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerCeilometerComputeImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCeilometerIpmiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCeilometerConfigImage:
|
||||
description: The container image to use for the ceilometer config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
CeilometerAgentIpmiLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -68,6 +72,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCeilometerIpmiImage: ContainerCeilometerIpmiImage
|
||||
ContainerCeilometerConfigImage: ContainerCeilometerConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCeilometerIpmiImage: {get_param: ContainerCeilometerIpmiImage}
|
||||
ContainerCeilometerConfigImage: {get_param: ContainerCeilometerConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Ceilometer Agent Ipmi role.
|
||||
|
|
@ -89,7 +107,7 @@ outputs:
|
|||
puppet_tags: ceilometer_config
|
||||
step_config: |
|
||||
include tripleo::profile::base::ceilometer::agent::polling
|
||||
config_image: {get_param: ContainerCeilometerConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCeilometerConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/ceilometer-agent-ipmi.json:
|
||||
command: /usr/bin/ceilometer-polling --polling-namespaces ipmi
|
||||
|
|
@ -102,7 +120,7 @@ outputs:
|
|||
step_3:
|
||||
ceilometer_init_log:
|
||||
start_order: 0
|
||||
image: &ceilometer_agent_ipmi_image {get_param: ContainerCeilometerIpmiImage}
|
||||
image: &ceilometer_agent_ipmi_image {get_attr: [RoleParametersValue, value, ContainerCeilometerIpmiImage]}
|
||||
net: none
|
||||
user: root
|
||||
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCeilometerNotificationImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCeilometerConfigImage:
|
||||
description: The container image to use for the ceilometer config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
CeilometerAgentNotificationLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -102,6 +106,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCeilometerNotificationImage: ContainerCeilometerNotificationImage
|
||||
ContainerCeilometerConfigImage: ContainerCeilometerConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCeilometerNotificationImage: {get_param: ContainerCeilometerNotificationImage}
|
||||
ContainerCeilometerConfigImage: {get_param: ContainerCeilometerConfigImage}
|
||||
|
||||
conditions:
|
||||
ceilometer_qdr_publish:
|
||||
or:
|
||||
|
|
@ -152,7 +170,7 @@ outputs:
|
|||
puppet_tags: ceilometer_config
|
||||
step_config: |
|
||||
include tripleo::profile::base::ceilometer::agent::notification
|
||||
config_image: {get_param: ContainerCeilometerConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCeilometerConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/ceilometer_agent_notification.json:
|
||||
command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log
|
||||
|
|
@ -167,7 +185,7 @@ outputs:
|
|||
step_3:
|
||||
ceilometer_init_log:
|
||||
start_order: 0
|
||||
image: &ceilometer_agent_notification_image {get_param: ContainerCeilometerNotificationImage}
|
||||
image: &ceilometer_agent_notification_image {get_attr: [RoleParametersValue, value, ContainerCeilometerNotificationImage]}
|
||||
net: none
|
||||
user: root
|
||||
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCinderApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCinderConfigImage:
|
||||
description: The container image to use for the cinder config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
CinderApiLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -128,6 +132,20 @@ resources:
|
|||
RoleParameters: {get_param: RoleParameters}
|
||||
EnableInternalTLS: {get_param: EnableInternalTLS}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCinderApiImage: ContainerCinderApiImage
|
||||
ContainerCinderConfigImage: ContainerCinderConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCinderApiImage: {get_param: ContainerCinderApiImage}
|
||||
ContainerCinderConfigImage: {get_param: ContainerCinderConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Cinder API role.
|
||||
|
|
@ -230,7 +248,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::cinder::api"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerCinderConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCinderConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/cinder_api.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -278,7 +296,7 @@ outputs:
|
|||
docker_config:
|
||||
step_2:
|
||||
cinder_api_init_logs:
|
||||
image: &cinder_api_image {get_param: ContainerCinderApiImage}
|
||||
image: &cinder_api_image {get_attr: [RoleParametersValue, value, ContainerCinderApiImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCinderBackupImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCinderConfigImage:
|
||||
description: The container image to use for the cinder config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -152,6 +156,20 @@ resources:
|
|||
CinderCommon:
|
||||
type: ./cinder-common-container-puppet.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCinderBackupImage: ContainerCinderBackupImage
|
||||
ContainerCinderConfigImage: ContainerCinderConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCinderBackupImage: {get_param: ContainerCinderBackupImage}
|
||||
ContainerCinderConfigImage: {get_param: ContainerCinderConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Cinder Backup role.
|
||||
|
|
@ -229,7 +247,7 @@ outputs:
|
|||
params:
|
||||
DRIVER: {get_param: CinderBackupBackend}
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerCinderConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCinderConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/cinder_backup.json:
|
||||
command: /usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf
|
||||
|
|
@ -239,7 +257,7 @@ outputs:
|
|||
step_3:
|
||||
cinder_backup_init_logs:
|
||||
start_order: 0
|
||||
image: &cinder_backup_image {get_param: ContainerCinderBackupImage}
|
||||
image: &cinder_backup_image {get_attr: [RoleParametersValue, value, ContainerCinderBackupImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCinderBackupImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCinderConfigImage:
|
||||
description: The container image to use for the cinder config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
|
|
@ -108,6 +112,20 @@ resources:
|
|||
CinderCommon:
|
||||
type: ./cinder-common-container-puppet.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCinderBackupImage: ContainerCinderBackupImage
|
||||
ContainerCinderConfigImage: ContainerCinderConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCinderBackupImage: {get_param: ContainerCinderBackupImage}
|
||||
ContainerCinderConfigImage: {get_param: ContainerCinderConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Cinder Backup role.
|
||||
|
|
@ -126,9 +144,9 @@ outputs:
|
|||
if:
|
||||
- {get_param: ClusterCommonTag}
|
||||
- yaql:
|
||||
data: {get_param: ContainerCinderBackupImage}
|
||||
data: {get_attr: [RoleParametersValue, value, ContainerCinderBackupImage]}
|
||||
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: ContainerCinderBackupImage}
|
||||
- {get_attr: [RoleParametersValue, value, ContainerCinderBackupImage]}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::cinder::backup_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_backup_volumes]}
|
||||
tripleo::profile::pacemaker::cinder::backup_bundle::docker_environment: {get_attr: [CinderCommon, cinder_backup_environment]}
|
||||
|
|
@ -147,7 +165,7 @@ outputs:
|
|||
- "\n"
|
||||
- - {get_attr: [CinderBackupBase, role_data, puppet_config, step_config]}
|
||||
- "include tripleo::profile::pacemaker::cinder::backup_bundle"
|
||||
config_image: {get_param: ContainerCinderConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCinderConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/cinder_backup.json:
|
||||
command: /usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf
|
||||
|
|
@ -158,7 +176,7 @@ outputs:
|
|||
step_3:
|
||||
cinder_backup_init_logs:
|
||||
start_order: 0
|
||||
image: {get_param: ContainerCinderBackupImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerCinderBackupImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
@ -172,7 +190,7 @@ outputs:
|
|||
import_role:
|
||||
name: tripleo_container_tag
|
||||
vars:
|
||||
container_image: {get_param: ContainerCinderBackupImage}
|
||||
container_image: {get_attr: [RoleParametersValue, value, ContainerCinderBackupImage]}
|
||||
container_image_latest: *cinder_backup_image_pcmklatest
|
||||
- name: Cinder Backup HA Wrappers Step
|
||||
when: step|int == 5
|
||||
|
|
@ -196,7 +214,7 @@ outputs:
|
|||
block: &cinder_backup_fetch_retag_container_tasks
|
||||
- name: Get container cinder_backup image
|
||||
set_fact:
|
||||
cinder_backup_image: {get_param: ContainerCinderBackupImage}
|
||||
cinder_backup_image: {get_attr: [RoleParametersValue, value, ContainerCinderBackupImage]}
|
||||
cinder_backup_image_latest: *cinder_backup_image_pcmklatest
|
||||
- name: Pull latest cinder_backup images
|
||||
command: "{{container_cli}} pull {{cinder_backup_image}}"
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCinderSchedulerImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCinderConfigImage:
|
||||
description: The container image to use for the cinder config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
CinderSchedulerLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -61,6 +65,20 @@ resources:
|
|||
CinderCommon:
|
||||
type: ./cinder-common-container-puppet.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCinderSchedulerImage: ContainerCinderSchedulerImage
|
||||
ContainerCinderConfigImage: ContainerCinderConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCinderSchedulerImage: {get_param: ContainerCinderSchedulerImage}
|
||||
ContainerCinderConfigImage: {get_param: ContainerCinderConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Cinder Scheduler role.
|
||||
|
|
@ -85,7 +103,7 @@ outputs:
|
|||
- - "include tripleo::profile::base::cinder::scheduler"
|
||||
- - {get_attr: [CinderBase, role_data, step_config]}
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerCinderConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCinderConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/cinder_scheduler.json:
|
||||
command: /usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf
|
||||
|
|
@ -110,7 +128,7 @@ outputs:
|
|||
docker_config:
|
||||
step_2:
|
||||
cinder_scheduler_init_logs:
|
||||
image: &cinder_scheduler_image {get_param: ContainerCinderSchedulerImage}
|
||||
image: &cinder_scheduler_image {get_attr: [RoleParametersValue, value, ContainerCinderSchedulerImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCinderVolumeImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCinderConfigImage:
|
||||
description: The container image to use for the cinder config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
DockerCinderVolumeUlimit:
|
||||
default: ['nofile=131072']
|
||||
description: ulimit for Cinder Volume Container
|
||||
|
|
@ -218,6 +222,20 @@ resources:
|
|||
CinderCommon:
|
||||
type: ./cinder-common-container-puppet.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCinderVolumeImage: ContainerCinderVolumeImage
|
||||
ContainerCinderConfigImage: ContainerCinderConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCinderVolumeImage: {get_param: ContainerCinderVolumeImage}
|
||||
ContainerCinderConfigImage: {get_param: ContainerCinderConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Cinder Volume role.
|
||||
|
|
@ -298,7 +316,7 @@ outputs:
|
|||
- - "include tripleo::profile::base::lvm"
|
||||
- "include tripleo::profile::base::cinder::volume"
|
||||
- get_attr: [MySQLClient, role_data, step_config]
|
||||
config_image: {get_param: ContainerCinderConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCinderConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/cinder_volume.json:
|
||||
command: /usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf
|
||||
|
|
@ -308,7 +326,7 @@ outputs:
|
|||
step_3:
|
||||
cinder_volume_init_logs:
|
||||
start_order: 0
|
||||
image: &cinder_volume_image {get_param: ContainerCinderVolumeImage}
|
||||
image: &cinder_volume_image {get_attr: [RoleParametersValue, value, ContainerCinderVolumeImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCinderVolumeImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCinderConfigImage:
|
||||
description: The container image to use for the cinder config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
|
|
@ -93,6 +97,20 @@ resources:
|
|||
CinderCommon:
|
||||
type: ./cinder-common-container-puppet.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCinderVolumeImage: ContainerCinderVolumeImage
|
||||
ContainerCinderConfigImage: ContainerCinderConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCinderVolumeImage: {get_param: ContainerCinderVolumeImage}
|
||||
ContainerCinderConfigImage: {get_param: ContainerCinderConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Cinder Volume role.
|
||||
|
|
@ -113,9 +131,9 @@ outputs:
|
|||
if:
|
||||
- {get_param: ClusterCommonTag}
|
||||
- yaql:
|
||||
data: {get_param: ContainerCinderVolumeImage}
|
||||
data: {get_attr: [RoleParametersValue, value, ContainerCinderVolumeImage]}
|
||||
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: ContainerCinderVolumeImage}
|
||||
- {get_attr: [RoleParametersValue, value, ContainerCinderVolumeImage]}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::cinder::volume_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_volume_volumes]}
|
||||
tripleo::profile::pacemaker::cinder::volume_bundle::docker_environment: {get_attr: [CinderCommon, cinder_volume_environment]}
|
||||
|
|
@ -136,7 +154,7 @@ outputs:
|
|||
- - "include tripleo::profile::base::lvm"
|
||||
- - "include tripleo::profile::pacemaker::cinder::volume_bundle"
|
||||
- get_attr: [MySQLClient, role_data, step_config]
|
||||
config_image: {get_param: ContainerCinderConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCinderConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/cinder_volume.json:
|
||||
command: /usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf
|
||||
|
|
@ -147,7 +165,7 @@ outputs:
|
|||
step_3:
|
||||
cinder_volume_init_logs:
|
||||
start_order: 0
|
||||
image: {get_param: ContainerCinderVolumeImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerCinderVolumeImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
@ -161,7 +179,7 @@ outputs:
|
|||
import_role:
|
||||
name: tripleo_container_tag
|
||||
vars:
|
||||
container_image: {get_param: ContainerCinderVolumeImage}
|
||||
container_image: {get_attr: [RoleParametersValue, value, ContainerCinderVolumeImage]}
|
||||
container_image_latest: *cinder_volume_image_pcmklatest
|
||||
- name: Cinder Volume HA Wrappers Step
|
||||
when: step|int == 5
|
||||
|
|
@ -185,7 +203,7 @@ outputs:
|
|||
block: &cinder_volume_fetch_retag_container_tasks
|
||||
- name: Get container cinder_volume image
|
||||
set_fact:
|
||||
cinder_volume_image: {get_param: ContainerCinderVolumeImage}
|
||||
cinder_volume_image: {get_attr: [RoleParametersValue, value, ContainerCinderVolumeImage]}
|
||||
cinder_volume_image_latest: *cinder_volume_image_pcmklatest
|
||||
- name: Pull latest cinder_volume images
|
||||
command: "{{container_cli}} pull {{cinder_volume_image}}"
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerMysqlImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerMysqlConfigImage:
|
||||
description: The container image to use for the mysql config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -62,6 +66,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerMysqlImage: ContainerMysqlImage
|
||||
ContainerMysqlConfigImage: ContainerMysqlConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerMysqlImage: {get_param: ContainerMysqlImage}
|
||||
ContainerMysqlConfigImage: {get_param: ContainerMysqlConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Containerized service MySQL using composable services.
|
||||
|
|
@ -98,7 +116,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
|
||||
- {get_attr: [MysqlBase, role_data, step_config]}
|
||||
config_image: &mysql_config_image {get_param: ContainerMysqlConfigImage}
|
||||
config_image: &mysql_config_image {get_attr: [RoleParametersValue, value, ContainerMysqlConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/mysql.json:
|
||||
command: /usr/libexec/mysqld --user=mysql
|
||||
|
|
@ -130,7 +148,7 @@ outputs:
|
|||
# Kolla_bootstrap runs before permissions set by kolla_config
|
||||
step_1:
|
||||
mysql_init_logs:
|
||||
image: &mysql_image {get_param: ContainerMysqlImage}
|
||||
image: &mysql_image {get_attr: [RoleParametersValue, value, ContainerMysqlImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
@ -281,7 +299,7 @@ outputs:
|
|||
pre_upgrade_mysql_image: "{{ mysql_infos.containers.0.ImageName }}"
|
||||
- name: Set fact for Mysql container image after upgrade
|
||||
set_fact:
|
||||
post_upgrade_mysql_image: {get_param: ContainerMysqlImage}
|
||||
post_upgrade_mysql_image: {get_attr: [RoleParametersValue, value, ContainerMysqlImage]}
|
||||
- name: Redo log clean-up script
|
||||
set_fact:
|
||||
# The purpose of this script is to start mysql so that it
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerMysqlImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerMysqlConfigImage:
|
||||
description: The container image to use for the mysql config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
|
|
@ -98,6 +102,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerMysqlImage: ContainerMysqlImage
|
||||
ContainerMysqlConfigImage: ContainerMysqlConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerMysqlImage: {get_param: ContainerMysqlImage}
|
||||
ContainerMysqlConfigImage: {get_param: ContainerMysqlConfigImage}
|
||||
|
||||
conditions:
|
||||
docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
|
||||
|
||||
|
|
@ -148,9 +166,9 @@ outputs:
|
|||
if:
|
||||
- {get_param: ClusterCommonTag}
|
||||
- yaql:
|
||||
data: {get_param: ContainerMysqlImage}
|
||||
data: {get_attr: [RoleParametersValue, value, ContainerMysqlImage]}
|
||||
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: ContainerMysqlImage}
|
||||
- {get_attr: [RoleParametersValue, value, ContainerMysqlImage]}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::database::mysql_bundle::control_port: 3123
|
||||
tripleo::profile::pacemaker::database::mysql_bundle::container_backend: {get_param: ContainerCli}
|
||||
|
|
@ -174,7 +192,7 @@ outputs:
|
|||
- - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
|
||||
- "exec {'wait-for-settle': command => '/bin/true' }"
|
||||
- "include tripleo::profile::pacemaker::database::mysql_bundle"
|
||||
config_image: {get_param: ContainerMysqlConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerMysqlConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/mysql.json:
|
||||
command: /usr/sbin/pacemaker_remoted
|
||||
|
|
@ -210,7 +228,7 @@ outputs:
|
|||
mysql_data_ownership:
|
||||
start_order: 0
|
||||
detach: false
|
||||
image: {get_param: ContainerMysqlImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerMysqlImage]}
|
||||
net: host
|
||||
user: root
|
||||
# Kolla does only non-recursive chown
|
||||
|
|
@ -220,7 +238,7 @@ outputs:
|
|||
mysql_bootstrap:
|
||||
start_order: 1
|
||||
detach: false
|
||||
image: {get_param: ContainerMysqlImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerMysqlImage]}
|
||||
net: host
|
||||
user: root
|
||||
# Kolla bootstraps aren't idempotent, explicitly checking if bootstrap was done
|
||||
|
|
@ -270,7 +288,7 @@ outputs:
|
|||
- if:
|
||||
- {get_param: ConfigDebug}
|
||||
- - '--debug'
|
||||
image: {get_param: ContainerMysqlImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerMysqlImage]}
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
|
||||
|
|
@ -304,7 +322,7 @@ outputs:
|
|||
import_role:
|
||||
name: tripleo_container_tag
|
||||
vars:
|
||||
container_image: {get_param: ContainerMysqlImage}
|
||||
container_image: {get_attr: [RoleParametersValue, value, ContainerMysqlImage]}
|
||||
container_image_latest: *mysql_image_pcmklatest
|
||||
- name: MySQL HA Wrappers Step
|
||||
when: step|int == 2
|
||||
|
|
@ -328,7 +346,7 @@ outputs:
|
|||
block: &mysql_fetch_retag_container_tasks
|
||||
- name: Get container galera image
|
||||
set_fact:
|
||||
galera_image: {get_param: ContainerMysqlImage}
|
||||
galera_image: {get_attr: [RoleParametersValue, value, ContainerMysqlImage]}
|
||||
galera_image_latest: *mysql_image_pcmklatest
|
||||
- name: Pull latest galera images
|
||||
command: "{{container_cli}} pull {{galera_image}}"
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerRedisImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerRedisConfigImage:
|
||||
description: The container image to use for the redis config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -62,6 +66,20 @@ resources:
|
|||
ServiceData: {get_param: ServiceData}
|
||||
ServiceNetMap: {get_param: ServiceNetMap}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerRedisImage: ContainerRedisImage
|
||||
ContainerRedisConfigImage: ContainerRedisConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerRedisImage: {get_param: ContainerRedisImage}
|
||||
ContainerRedisConfigImage: {get_param: ContainerRedisConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Redis API role.
|
||||
|
|
@ -110,7 +128,7 @@ outputs:
|
|||
- "\n"
|
||||
- - include tripleo::profile::base::database::redis
|
||||
- {get_attr: [RedisBase, role_data, step_config]}
|
||||
config_image: {get_param: ContainerRedisConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerRedisConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/redis.json:
|
||||
command: /usr/bin/redis-server /etc/redis.conf
|
||||
|
|
@ -136,7 +154,7 @@ outputs:
|
|||
- redis_init_logs:
|
||||
start_order: 0
|
||||
detach: false
|
||||
image: &redis_image {get_param: ContainerRedisImage}
|
||||
image: &redis_image {get_attr: [RoleParametersValue, value, ContainerRedisImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerRedisImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerRedisConfigImage:
|
||||
description: The container image to use for the redis config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
|
|
@ -100,6 +104,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerRedisImage: ContainerRedisImage
|
||||
ContainerRedisConfigImage: ContainerRedisConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerRedisImage: {get_param: ContainerRedisImage}
|
||||
ContainerRedisConfigImage: {get_param: ContainerRedisConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Redis API role.
|
||||
|
|
@ -126,9 +144,9 @@ outputs:
|
|||
if:
|
||||
- {get_param: ClusterCommonTag}
|
||||
- yaql:
|
||||
data: {get_param: ContainerRedisImage}
|
||||
data: {get_attr: [RoleParametersValue, value, ContainerRedisImage]}
|
||||
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: ContainerRedisImage}
|
||||
- {get_attr: [RoleParametersValue, value, ContainerRedisImage]}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::database::redis_bundle::redis_docker_control_port: 3124
|
||||
tripleo::profile::pacemaker::database::redis_bundle::container_backend: {get_param: ContainerCli}
|
||||
|
|
@ -180,7 +198,7 @@ outputs:
|
|||
puppet_tags: 'exec'
|
||||
step_config: |
|
||||
include tripleo::profile::pacemaker::database::redis_bundle
|
||||
config_image: &redis_config_image {get_param: ContainerRedisConfigImage}
|
||||
config_image: &redis_config_image {get_attr: [RoleParametersValue, value, ContainerRedisConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/redis.json:
|
||||
command: /usr/sbin/pacemaker_remoted
|
||||
|
|
@ -239,7 +257,7 @@ outputs:
|
|||
- {get_param: EnableInternalTLS}
|
||||
- redis_tls_proxy:
|
||||
start_order: 0
|
||||
image: {get_param: ContainerRedisImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerRedisImage]}
|
||||
net: host
|
||||
user: root
|
||||
restart: always
|
||||
|
|
@ -281,7 +299,7 @@ outputs:
|
|||
import_role:
|
||||
name: tripleo_container_tag
|
||||
vars:
|
||||
container_image: {get_param: ContainerRedisImage}
|
||||
container_image: {get_attr: [RoleParametersValue, value, ContainerRedisImage]}
|
||||
container_image_latest: *redis_image_pcmklatest
|
||||
- name: Redis HA Wrappers Step
|
||||
when: step|int == 2
|
||||
|
|
@ -311,7 +329,7 @@ outputs:
|
|||
block: &redis_fetch_retag_container_tasks
|
||||
- name: Get container redis image
|
||||
set_fact:
|
||||
redis_image: {get_param: ContainerRedisImage}
|
||||
redis_image: {get_attr: [RoleParametersValue, value, ContainerRedisImage]}
|
||||
redis_image_latest: *redis_image_pcmklatest
|
||||
- name: Pull latest redis images
|
||||
command: "{{container_cli}} pull {{redis_image}}"
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerMultipathdImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerMultipathdConfigImage:
|
||||
description: The container image to use for the multipathd config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
MultipathdEnable:
|
||||
default: false
|
||||
description: Whether to enable the multipath daemon
|
||||
|
|
@ -57,6 +61,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerMultipathdImage: ContainerMultipathdImage
|
||||
ContainerMultipathdConfigImage: ContainerMultipathdConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerMultipathdImage: {get_param: ContainerMultipathdImage}
|
||||
ContainerMultipathdConfigImage: {get_param: ContainerMultipathdConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Multipathd API role.
|
||||
|
|
@ -90,7 +108,7 @@ outputs:
|
|||
- find_multipaths_enabled
|
||||
- 'y'
|
||||
- 'n'
|
||||
config_image: {get_param: ContainerMultipathdConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerMultipathdConfigImage]}
|
||||
volumes:
|
||||
- /etc/multipath.conf:/etc/multipath.conf:z
|
||||
kolla_config:
|
||||
|
|
@ -109,7 +127,7 @@ outputs:
|
|||
step_3:
|
||||
multipathd:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerMultipathdImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerMultipathdImage]}
|
||||
net: host
|
||||
privileged: true
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,11 +7,15 @@ parameters:
|
|||
ContainerNovaLibvirtImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
# we configure libvirt via the nova-compute container due to coupling
|
||||
# in the puppet modules
|
||||
ContainerNovaLibvirtConfigImage:
|
||||
description: The container image to use for the nova_libvirt config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNovaLibvirtUlimit:
|
||||
default: ['nofile=131072', 'nproc=126960']
|
||||
description: ulimit for Nova Libvirt Container
|
||||
|
|
@ -323,11 +327,15 @@ resources:
|
|||
- vhostuser_socket_group: VhostuserSocketGroup
|
||||
nova::compute::libvirt::qemu::memory_backing_dir: QemuMemoryBackingDir
|
||||
nova_libvirt_opt_volumes: NovaLibvirtOptVolumes
|
||||
ContainerNovaLibvirtImage: ContainerNovaLibvirtImage
|
||||
ContainerNovaLibvirtConfigImage: ContainerNovaLibvirtConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
VhostuserSocketGroup: {get_param: VhostuserSocketGroup}
|
||||
QemuMemoryBackingDir: {get_param: QemuMemoryBackingDir}
|
||||
NovaLibvirtOptVolumes: {get_param: NovaLibvirtOptVolumes}
|
||||
ContainerNovaLibvirtImage: {get_param: ContainerNovaLibvirtImage}
|
||||
ContainerNovaLibvirtConfigImage: {get_param: ContainerNovaLibvirtConfigImage}
|
||||
|
||||
ContainersCommon:
|
||||
type: ../../containers-common.yaml
|
||||
|
|
@ -367,7 +375,7 @@ outputs:
|
|||
tripleo::profile::base::nova::virtlogd_wrapper::enable_wrapper: {get_param: NovaEnableVirtlogdContainerWrapper}
|
||||
# don't think this is a good place as /var/lib/nova can also be shared storage
|
||||
tripleo::profile::base::nova::virtlogd_wrapper::virtlogd_process_wrapper: '/var/lib/container-config-scripts/virtlogd_wrapper'
|
||||
tripleo::profile::base::nova::virtlogd_wrapper::virtlogd_image: {get_param: ContainerNovaLibvirtImage}
|
||||
tripleo::profile::base::nova::virtlogd_wrapper::virtlogd_image: {get_attr: [RoleParametersValue, value, ContainerNovaLibvirtImage]}
|
||||
tripleo::profile::base::nova::virtlogd_wrapper::debug:
|
||||
if:
|
||||
- {get_param: VirtlogdWrapperDebug}
|
||||
|
|
@ -453,7 +461,7 @@ outputs:
|
|||
puppet_tags: libvirtd_config,virtlogd_config,nova_config,file,libvirt_tls_password
|
||||
step_config: |
|
||||
include tripleo::profile::base::nova::libvirt
|
||||
config_image: {get_param: ContainerNovaLibvirtConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNovaLibvirtConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/nova_libvirt.json:
|
||||
command: /nova_libvirt_launcher.sh
|
||||
|
|
@ -536,7 +544,7 @@ outputs:
|
|||
- '4'
|
||||
- 'file'
|
||||
- 'include ::tripleo::profile::base::nova::virtlogd_wrapper'
|
||||
image: {get_param: ContainerNovaLibvirtImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaLibvirtImage]}
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
|
||||
|
|
@ -551,7 +559,7 @@ outputs:
|
|||
- {get_param: NovaEnableVirtlogdContainerWrapper}
|
||||
- nova_virtlogd_wrapper: &virtlog_container_config
|
||||
start_order: 0
|
||||
image: {get_param: ContainerNovaLibvirtImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaLibvirtImage]}
|
||||
ulimit: {get_param: ContainerNovaLibvirtUlimit}
|
||||
cgroupns: host
|
||||
net: host
|
||||
|
|
@ -584,7 +592,7 @@ outputs:
|
|||
- nova_virtlogd: *virtlog_container_config
|
||||
- nova_libvirt:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerNovaLibvirtImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaLibvirtImage]}
|
||||
ulimit: {get_param: ContainerNovaLibvirtUlimit}
|
||||
cgroupns: host
|
||||
net: host
|
||||
|
|
@ -648,7 +656,7 @@ outputs:
|
|||
- need_libvirt_secret
|
||||
- nova_libvirt_init_secret:
|
||||
detach: false
|
||||
image: {get_param: ContainerNovaLibvirtImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaLibvirtImage]}
|
||||
security_opt:
|
||||
- label=disable
|
||||
privileged: false
|
||||
|
|
|
|||
|
|
@ -7,12 +7,18 @@ parameters:
|
|||
ContainerNovajoinServerImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNovajoinNotifierImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNovajoinConfigImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -91,6 +97,22 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNovajoinServerImage: ContainerNovajoinServerImage
|
||||
ContainerNovajoinNotifierImage: ContainerNovajoinNotifierImage
|
||||
ContainerNovajoinConfigImage: ContainerNovajoinConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNovajoinServerImage: {get_param: ContainerNovajoinServerImage}
|
||||
ContainerNovajoinNotifierImage: {get_param: ContainerNovajoinNotifierImage}
|
||||
ContainerNovajoinConfigImage: {get_param: ContainerNovajoinConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the novajoin API role.
|
||||
|
|
@ -181,7 +203,7 @@ outputs:
|
|||
config_volume: novajoin
|
||||
puppet_tags: novajoin_config
|
||||
step_config: include tripleo::profile::base::novajoin
|
||||
config_image: {get_param: ContainerNovajoinConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNovajoinConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/novajoin_server.json:
|
||||
command: novajoin-server --config-file /etc/novajoin/join.conf
|
||||
|
|
@ -201,7 +223,7 @@ outputs:
|
|||
step_4:
|
||||
novajoin_server:
|
||||
start_order: 0
|
||||
image: {get_param: ContainerNovajoinServerImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovajoinServerImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -219,7 +241,7 @@ outputs:
|
|||
KRB5_CONFIG: /etc/novajoin/krb5.conf
|
||||
novajoin_notifier:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerNovajoinNotifierImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovajoinNotifierImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerDesignateApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerDesignateApiConfigImage:
|
||||
description: The container image to use for the designate config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
DesignateApiLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -83,6 +87,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerDesignateApiImage: ContainerDesignateApiImage
|
||||
ContainerDesignateApiConfigImage: ContainerDesignateApiConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerDesignateApiImage: {get_param: ContainerDesignateApiImage}
|
||||
ContainerDesignateApiConfigImage: {get_param: ContainerDesignateApiConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Designate API role.
|
||||
|
|
@ -155,7 +173,7 @@ outputs:
|
|||
puppet_tags: designate_config,designate_api_paste_ini
|
||||
step_config: |
|
||||
include tripleo::profile::base::designate::api
|
||||
config_image: {get_param: ContainerDesignateApiConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerDesignateApiConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/designate_api.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -180,7 +198,7 @@ outputs:
|
|||
step_4:
|
||||
designate_api:
|
||||
start_order: 15
|
||||
image: &designate_api_image {get_param: ContainerDesignateApiImage}
|
||||
image: &designate_api_image {get_attr: [RoleParametersValue, value, ContainerDesignateApiImage]}
|
||||
net: host
|
||||
stop_grace_period: 300
|
||||
privileged: false
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerDesignateBackendBIND9Image:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerDesignateConfigImage:
|
||||
description: The container image to use for the designate config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -59,6 +63,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerDesignateBackendBIND9Image: ContainerDesignateBackendBIND9Image
|
||||
ContainerDesignateConfigImage: ContainerDesignateConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerDesignateBackendBIND9Image: {get_param: ContainerDesignateBackendBIND9Image}
|
||||
ContainerDesignateConfigImage: {get_param: ContainerDesignateConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Designate Bind instance.
|
||||
|
|
@ -84,7 +102,7 @@ outputs:
|
|||
config_volume: designate
|
||||
puppet_tags: designate_config
|
||||
step_config: {get_attr: [DesignateBase, role_data, step_config]}
|
||||
config_image: {get_param: ContainerDesignateConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerDesignateConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/designate_backend_bind9.json:
|
||||
command: /usr/sbin/named -u named -c /etc/named.conf -f
|
||||
|
|
@ -133,7 +151,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
designate_backend_bind9:
|
||||
image: {get_param: ContainerDesignateBackendBIND9Image}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerDesignateBackendBIND9Image]}
|
||||
net: host
|
||||
privileged: true
|
||||
stop_grace_period: 300
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerDesignateCentralImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerDesignateConfigImage:
|
||||
description: The container image to use for the designate config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -93,6 +97,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerDesignateCentralImage: ContainerDesignateCentralImage
|
||||
ContainerDesignateConfigImage: ContainerDesignateConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerDesignateCentralImage: {get_param: ContainerDesignateCentralImage}
|
||||
ContainerDesignateConfigImage: {get_param: ContainerDesignateConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Designate Central role.
|
||||
|
|
@ -149,7 +167,7 @@ outputs:
|
|||
- - {get_attr: [DesignateBase, role_data, step_config]}
|
||||
- "include tripleo::profile::base::designate::central"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerDesignateConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerDesignateConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/designate_central.json:
|
||||
command: /usr/bin/designate-central --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/central.log
|
||||
|
|
@ -179,7 +197,7 @@ outputs:
|
|||
# db sync runs before permissions set by kolla_config
|
||||
step_2:
|
||||
designate_init_logs:
|
||||
image: &designate_central_image {get_param: ContainerDesignateCentralImage}
|
||||
image: &designate_central_image {get_attr: [RoleParametersValue, value, ContainerDesignateCentralImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerDesignateMDNSImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerDesignateConfigImage:
|
||||
description: The container image to use for the designate config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -71,6 +75,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerDesignateMDNSImage: ContainerDesignateMDNSImage
|
||||
ContainerDesignateConfigImage: ContainerDesignateConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerDesignateMDNSImage: {get_param: ContainerDesignateMDNSImage}
|
||||
ContainerDesignateConfigImage: {get_param: ContainerDesignateConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Designate MDNS role.
|
||||
|
|
@ -132,7 +150,7 @@ outputs:
|
|||
- - {get_attr: [DesignateBase, role_data, step_config]}
|
||||
- "include tripleo::profile::base::designate::mdns"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerDesignateConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerDesignateConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/designate_mdns.json:
|
||||
command: /usr/bin/designate-mdns --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/mdns.log
|
||||
|
|
@ -148,7 +166,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
designate_mdns:
|
||||
image: &designate_mdns_image {get_param: ContainerDesignateMDNSImage}
|
||||
image: &designate_mdns_image {get_attr: [RoleParametersValue, value, ContainerDesignateMDNSImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerDesignateProducerImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerDesignateConfigImage:
|
||||
description: The container image to use for the designate config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
DesignateProducerLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -67,6 +71,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerDesignateProducerImage: ContainerDesignateProducerImage
|
||||
ContainerDesignateConfigImage: ContainerDesignateConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerDesignateProducerImage: {get_param: ContainerDesignateProducerImage}
|
||||
ContainerDesignateConfigImage: {get_param: ContainerDesignateConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Designate Producer role.
|
||||
|
|
@ -95,7 +113,7 @@ outputs:
|
|||
- "\n"
|
||||
- - {get_attr: [DesignateBase, role_data, step_config]}
|
||||
- "include tripleo::profile::base::designate::producer"
|
||||
config_image: {get_param: ContainerDesignateConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerDesignateConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/designate_producer.json:
|
||||
command: /usr/bin/designate-producer --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/producer.log
|
||||
|
|
@ -111,7 +129,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
designate_producer:
|
||||
image: &designate_producer_image {get_param: ContainerDesignateProducerImage}
|
||||
image: &designate_producer_image {get_attr: [RoleParametersValue, value, ContainerDesignateProducerImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerDesignateSinkImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerDesignateConfigImage:
|
||||
description: The container image to use for the designate config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -58,6 +62,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerDesignateSinkImage: ContainerDesignateSinkImage
|
||||
ContainerDesignateConfigImage: ContainerDesignateConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerDesignateSinkImage: {get_param: ContainerDesignateSinkImage}
|
||||
ContainerDesignateConfigImage: {get_param: ContainerDesignateConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Designate Sink role.
|
||||
|
|
@ -82,7 +100,7 @@ outputs:
|
|||
- "\n"
|
||||
- - {get_attr: [DesignateBase, role_data, step_config]}
|
||||
- "include tripleo::profile::base::designate::sink"
|
||||
config_image: {get_param: ContainerDesignateConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerDesignateConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/designate_sink.json:
|
||||
command: /usr/bin/designate-sink --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/sink.log
|
||||
|
|
@ -98,7 +116,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
designate_sink:
|
||||
image: &designate_sink_image {get_param: ContainerDesignateSinkImage}
|
||||
image: &designate_sink_image {get_attr: [RoleParametersValue, value, ContainerDesignateSinkImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerDesignateWorkerImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerDesignateConfigImage:
|
||||
description: The container image to use for the designate config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
DesignateWorkerLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -67,6 +71,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerDesignateWorkerImage: ContainerDesignateWorkerImage
|
||||
ContainerDesignateConfigImage: ContainerDesignateConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerDesignateWorkerImage: {get_param: ContainerDesignateWorkerImage}
|
||||
ContainerDesignateConfigImage: {get_param: ContainerDesignateConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Designate Worker role.
|
||||
|
|
@ -106,7 +124,7 @@ outputs:
|
|||
- - {get_attr: [DesignateBase, role_data, step_config]}
|
||||
- "include tripleo::profile::base::designate::worker"
|
||||
- "include tripleo::profile::base::designate::backend"
|
||||
config_image: {get_param: ContainerDesignateConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerDesignateConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/designate_worker.json:
|
||||
command: /usr/bin/designate-worker --config-file=/etc/designate/designate.conf --log-file=/var/log/designate/worker.log
|
||||
|
|
@ -129,7 +147,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
designate_worker:
|
||||
image: &designate_worker_image {get_param: ContainerDesignateWorkerImage}
|
||||
image: &designate_worker_image {get_attr: [RoleParametersValue, value, ContainerDesignateWorkerImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
stop_grace_period: 300
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerEtcdImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerEtcdConfigImage:
|
||||
description: The container image to use for the etcd config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -91,6 +95,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerEtcdImage: ContainerEtcdImage
|
||||
ContainerEtcdConfigImage: ContainerEtcdConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerEtcdImage: {get_param: ContainerEtcdImage}
|
||||
ContainerEtcdConfigImage: {get_param: ContainerEtcdConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the etcd role.
|
||||
|
|
@ -135,7 +153,7 @@ outputs:
|
|||
# BEGIN DOCKER SETTINGS
|
||||
puppet_config:
|
||||
config_volume: etcd
|
||||
config_image: &etcd_config_image {get_param: ContainerEtcdConfigImage}
|
||||
config_image: &etcd_config_image {get_attr: [RoleParametersValue, value, ContainerEtcdConfigImage]}
|
||||
step_config:
|
||||
list_join:
|
||||
- "\n"
|
||||
|
|
@ -165,7 +183,7 @@ outputs:
|
|||
docker_config:
|
||||
step_2:
|
||||
etcd:
|
||||
image: {get_param: ContainerEtcdImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerEtcdImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ parameters:
|
|||
ContainerFrrImage:
|
||||
description: The container image for Frr
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -137,6 +139,19 @@ parameters:
|
|||
constraints:
|
||||
- allowed_values: ['internal', 'external']
|
||||
|
||||
resources:
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerFrrImage: ContainerFrrImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerFrrImage: {get_param: ContainerFrrImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the FRR service
|
||||
|
|
@ -189,7 +204,7 @@ outputs:
|
|||
step_0:
|
||||
frr:
|
||||
start_order: 0
|
||||
image: {get_param: ContainerFrrImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerFrrImage]}
|
||||
net: host
|
||||
restart: always
|
||||
healthcheck:
|
||||
|
|
|
|||
|
|
@ -317,9 +317,13 @@ parameters:
|
|||
ContainerGlanceApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerGlanceApiConfigImage:
|
||||
description: The container image to use for the glance_api config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
GlanceCronDbPurgeMinute:
|
||||
type: string
|
||||
description: >
|
||||
|
|
@ -435,6 +439,20 @@ resources:
|
|||
RoleParameters: {get_param: RoleParameters}
|
||||
EnableInternalTLS: {get_param: EnableInternalTLS}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerGlanceApiImage: ContainerGlanceApiImage
|
||||
ContainerGlanceApiConfigImage: ContainerGlanceApiConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerGlanceApiImage: {get_param: ContainerGlanceApiImage}
|
||||
ContainerGlanceApiConfigImage: {get_param: ContainerGlanceApiConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Glance API role.
|
||||
|
|
@ -647,7 +665,7 @@ outputs:
|
|||
- {get_param: GlanceNetappNfsEnabled}
|
||||
- include tripleo::profile::base::glance::netapp
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerGlanceApiConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerGlanceApiConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/glance_api.json:
|
||||
command: /usr/bin/glance-api --config-file /etc/glance/glance-api.conf --config-file /etc/glance/glance-image-import.conf
|
||||
|
|
@ -720,7 +738,7 @@ outputs:
|
|||
get_attr: [GlanceLogging, docker_config, step_2]
|
||||
step_3:
|
||||
glance_api_db_sync:
|
||||
image: &glance_api_image {get_param: ContainerGlanceApiImage}
|
||||
image: &glance_api_image {get_attr: [RoleParametersValue, value, ContainerGlanceApiImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
detach: false
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerGnocchiApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerGnocchiConfigImage:
|
||||
description: The container image to use for the gnocchi config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
GnocchiApiLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -159,6 +163,20 @@ resources:
|
|||
RoleParameters: {get_param: RoleParameters}
|
||||
EnableInternalTLS: {get_param: EnableInternalTLS}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerGnocchiApiImage: ContainerGnocchiApiImage
|
||||
ContainerGnocchiConfigImage: ContainerGnocchiConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerGnocchiApiImage: {get_param: ContainerGnocchiApiImage}
|
||||
ContainerGnocchiConfigImage: {get_param: ContainerGnocchiConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the gnocchi API role.
|
||||
|
|
@ -255,7 +273,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::gnocchi::api"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerGnocchiConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerGnocchiConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/gnocchi_api.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -308,7 +326,7 @@ outputs:
|
|||
# db sync runs before permissions set by kolla_config
|
||||
step_2:
|
||||
gnocchi_init_log:
|
||||
image: &gnocchi_api_image {get_param: ContainerGnocchiApiImage}
|
||||
image: &gnocchi_api_image {get_attr: [RoleParametersValue, value, ContainerGnocchiApiImage]}
|
||||
net: none
|
||||
user: root
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerGnocchiMetricdImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerGnocchiConfigImage:
|
||||
description: The container image to use for the gnocchi config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -92,6 +96,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerGnocchiMetricdImage: ContainerGnocchiMetricdImage
|
||||
ContainerGnocchiConfigImage: ContainerGnocchiConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerGnocchiMetricdImage: {get_param: ContainerGnocchiMetricdImage}
|
||||
ContainerGnocchiConfigImage: {get_param: ContainerGnocchiConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Gnocchi API role.
|
||||
|
|
@ -113,7 +131,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::gnocchi::metricd"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerGnocchiConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerGnocchiConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/gnocchi_metricd.json:
|
||||
command: /usr/bin/gnocchi-metricd
|
||||
|
|
@ -142,7 +160,7 @@ outputs:
|
|||
step_5:
|
||||
gnocchi_metricd:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerGnocchiMetricdImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerGnocchiMetricdImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerGnocchiStatsdImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerGnocchiConfigImage:
|
||||
description: The container image to use for the gnocchi config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -84,6 +88,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerGnocchiStatsdImage: ContainerGnocchiStatsdImage
|
||||
ContainerGnocchiConfigImage: ContainerGnocchiConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerGnocchiStatsdImage: {get_param: ContainerGnocchiStatsdImage}
|
||||
ContainerGnocchiConfigImage: {get_param: ContainerGnocchiConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Gnocchi API role.
|
||||
|
|
@ -105,7 +123,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::gnocchi::statsd"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerGnocchiConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerGnocchiConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/gnocchi_statsd.json:
|
||||
command: /usr/bin/gnocchi-statsd
|
||||
|
|
@ -134,7 +152,7 @@ outputs:
|
|||
step_5:
|
||||
gnocchi_statsd:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerGnocchiStatsdImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerGnocchiStatsdImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerHAProxyImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerHAProxyConfigImage:
|
||||
description: The container image to use for the haproxy config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
|
|
@ -153,6 +157,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerHAProxyImage: ContainerHAProxyImage
|
||||
ContainerHAProxyConfigImage: ContainerHAProxyConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerHAProxyImage: {get_param: ContainerHAProxyImage}
|
||||
ContainerHAProxyConfigImage: {get_param: ContainerHAProxyConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the HAproxy role.
|
||||
|
|
@ -205,7 +223,7 @@ outputs:
|
|||
puppet_tags: haproxy_config
|
||||
step_config: |
|
||||
class {'tripleo::profile::base::haproxy': manage_firewall => false}
|
||||
config_image: {get_param: ContainerHAProxyConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerHAProxyConfigImage]}
|
||||
volumes:
|
||||
list_concat:
|
||||
- if:
|
||||
|
|
@ -260,7 +278,7 @@ outputs:
|
|||
- get_attr: [HAProxyLogging, docker_config, step_1]
|
||||
- haproxy:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerHAProxyImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHAProxyImage]}
|
||||
net: host
|
||||
restart: always
|
||||
security_opt:
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerHAProxyImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerHAProxyConfigImage:
|
||||
description: The container image to use for the haproxy config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
|
|
@ -154,6 +158,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerHAProxyImage: ContainerHAProxyImage
|
||||
ContainerHAProxyConfigImage: ContainerHAProxyConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerHAProxyImage: {get_param: ContainerHAProxyImage}
|
||||
ContainerHAProxyConfigImage: {get_param: ContainerHAProxyConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the HAproxy role.
|
||||
|
|
@ -207,9 +225,9 @@ outputs:
|
|||
if:
|
||||
- {get_param: ClusterCommonTag}
|
||||
- yaql:
|
||||
data: {get_param: ContainerHAProxyImage}
|
||||
data: {get_attr: [RoleParametersValue, value, ContainerHAProxyImage]}
|
||||
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: ContainerHAProxyImage}
|
||||
- {get_attr: [RoleParametersValue, value, ContainerHAProxyImage]}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
service_config_settings:
|
||||
rsyslog:
|
||||
|
|
@ -226,7 +244,7 @@ outputs:
|
|||
- "class tripleo::firewall(){}; define tripleo::firewall::rule( $port = undef, $dport = undef, $sport = undef, $proto = undef, $action = undef, $state = undef, $source = undef, $iniface = undef, $chain = undef, $destination = undef, $extras = undef){}"
|
||||
- "['pcmk_bundle', 'pcmk_resource', 'pcmk_property', 'pcmk_constraint', 'pcmk_resource_default'].each |String $val| { noop_resource($val) }"
|
||||
- 'include tripleo::profile::pacemaker::haproxy_bundle'
|
||||
config_image: {get_param: ContainerHAProxyConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerHAProxyConfigImage]}
|
||||
volumes: &deployed_cert_mount
|
||||
yaql:
|
||||
expression: $.data.select($+":"+$+":ro")
|
||||
|
|
@ -326,7 +344,7 @@ outputs:
|
|||
import_role:
|
||||
name: tripleo_container_tag
|
||||
vars:
|
||||
container_image: {get_param: ContainerHAProxyImage}
|
||||
container_image: {get_attr: [RoleParametersValue, value, ContainerHAProxyImage]}
|
||||
container_image_latest: *haproxy_image_pcmklatest
|
||||
- name: HAproxy HA Wrappers Step
|
||||
when: step|int == 2
|
||||
|
|
@ -399,7 +417,7 @@ outputs:
|
|||
block: &haproxy_fetch_retag_container_tasks
|
||||
- name: Get container haproxy image
|
||||
set_fact:
|
||||
haproxy_image: {get_param: ContainerHAProxyImage}
|
||||
haproxy_image: {get_attr: [RoleParametersValue, value, ContainerHAProxyImage]}
|
||||
haproxy_image_latest: *haproxy_image_pcmklatest
|
||||
- name: Pull latest haproxy images
|
||||
command: "{{container_cli}} pull {{haproxy_image}}"
|
||||
|
|
|
|||
|
|
@ -7,10 +7,14 @@ parameters:
|
|||
ContainerHeatApiCfnImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
# puppet needs the heat-wsgi-api-cfn binary from centos-binary-heat-api-cfn
|
||||
ContainerHeatApiCfnConfigImage:
|
||||
description: The container image to use for the heat_api_cfn config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
HeatApiCfnLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -89,6 +93,20 @@ resources:
|
|||
HeatApiCfnLogging:
|
||||
type: OS::TripleO::Services::Logging::HeatApiCfn
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerHeatApiCfnImage: ContainerHeatApiCfnImage
|
||||
ContainerHeatApiCfnConfigImage: ContainerHeatApiCfnConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerHeatApiCfnImage: {get_param: ContainerHeatApiCfnImage}
|
||||
ContainerHeatApiCfnConfigImage: {get_param: ContainerHeatApiCfnConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Heat API CFN role.
|
||||
|
|
@ -157,7 +175,7 @@ outputs:
|
|||
puppet_tags: heat_config,file,concat,file_line
|
||||
step_config: |
|
||||
include tripleo::profile::base::heat::api_cfn
|
||||
config_image: {get_param: ContainerHeatApiCfnConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerHeatApiCfnConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/heat_api_cfn.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -183,7 +201,7 @@ outputs:
|
|||
get_attr: [HeatApiCfnLogging, docker_config, step_2]
|
||||
step_4:
|
||||
heat_api_cfn:
|
||||
image: {get_param: ContainerHeatApiCfnImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHeatApiCfnImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,10 +7,14 @@ parameters:
|
|||
ContainerHeatApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
# puppet needs the heat-wsgi-api binary from centos-binary-heat-api
|
||||
ContainerHeatApiConfigImage:
|
||||
description: The container image to use for the heat_api config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
HeatApiLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -107,6 +111,20 @@ resources:
|
|||
HeatApiLogging:
|
||||
type: OS::TripleO::Services::Logging::HeatApi
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerHeatApiImage: ContainerHeatApiImage
|
||||
ContainerHeatApiConfigImage: ContainerHeatApiConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerHeatApiImage: {get_param: ContainerHeatApiImage}
|
||||
ContainerHeatApiConfigImage: {get_param: ContainerHeatApiConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Heat API role.
|
||||
|
|
@ -187,7 +205,7 @@ outputs:
|
|||
puppet_tags: heat_config,file,concat,file_line,heat_api_paste_ini
|
||||
step_config: |
|
||||
include tripleo::profile::base::heat::api
|
||||
config_image: {get_param: ContainerHeatApiConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerHeatApiConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/heat_api.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -224,7 +242,7 @@ outputs:
|
|||
get_attr: [HeatApiLogging, docker_config, step_2]
|
||||
step_4:
|
||||
heat_api:
|
||||
image: {get_param: ContainerHeatApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHeatApiImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -249,7 +267,7 @@ outputs:
|
|||
- {get_param: HeatApiOptEnvVars}
|
||||
- KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||
heat_api_cron:
|
||||
image: {get_param: ContainerHeatApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHeatApiImage]}
|
||||
net: host
|
||||
user: root
|
||||
privileged: false
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerHeatEngineImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerHeatConfigImage:
|
||||
description: The container image to use for the heat config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
HeatEngineLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -138,6 +142,20 @@ resources:
|
|||
HeatEngineLogging:
|
||||
type: OS::TripleO::Services::Logging::HeatEngine
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerHeatEngineImage: ContainerHeatEngineImage
|
||||
ContainerHeatConfigImage: ContainerHeatConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerHeatEngineImage: {get_param: ContainerHeatEngineImage}
|
||||
ContainerHeatConfigImage: {get_param: ContainerHeatConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Heat Engine role.
|
||||
|
|
@ -214,7 +232,7 @@ outputs:
|
|||
- "\n"
|
||||
- - include tripleo::profile::base::heat::engine
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerHeatConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerHeatConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/heat_engine.json:
|
||||
command:
|
||||
|
|
@ -241,7 +259,7 @@ outputs:
|
|||
get_attr: [HeatEngineLogging, docker_config, step_2]
|
||||
step_3:
|
||||
heat_engine_db_sync:
|
||||
image: &heat_engine_image {get_param: ContainerHeatEngineImage}
|
||||
image: &heat_engine_image {get_attr: [RoleParametersValue, value, ContainerHeatEngineImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
detach: false
|
||||
|
|
|
|||
|
|
@ -7,18 +7,28 @@ parameters:
|
|||
ContainerHeatAllImage:
|
||||
description: The container image to use for heat-all
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerHeatEngineImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerHeatConfigImage:
|
||||
description: The container image to use for the heat config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerHeatApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerHeatApiConfigImage:
|
||||
description: The container image to use for the heat_api config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
|
|
@ -50,6 +60,28 @@ parameters:
|
|||
For example: {'overcloud': '/home/stack/roles_data.yaml'}
|
||||
type: json
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerHeatAllImage: ContainerHeatAllImage
|
||||
ContainerHeatEngineImage: ContainerHeatEngineImage
|
||||
ContainerHeatConfigImage: ContainerHeatConfigImage
|
||||
ContainerHeatApiImage: ContainerHeatApiImage
|
||||
ContainerHeatApiConfigImage: ContainerHeatApiConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerHeatAllImage: {get_param: ContainerHeatAllImage}
|
||||
ContainerHeatEngineImage: {get_param: ContainerHeatEngineImage}
|
||||
ContainerHeatConfigImage: {get_param: ContainerHeatConfigImage}
|
||||
ContainerHeatApiImage: {get_param: ContainerHeatApiImage}
|
||||
ContainerHeatApiConfigImage: {get_param: ContainerHeatApiConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Heat Ephemeral
|
||||
|
|
@ -64,19 +96,19 @@ outputs:
|
|||
import_role:
|
||||
name: tripleo_container_tag
|
||||
vars:
|
||||
container_image: {get_param: ContainerHeatAllImage}
|
||||
container_image: {get_attr: [RoleParametersValue, value, ContainerHeatAllImage]}
|
||||
container_image_latest: "localhost/tripleo/openstack-heat-all:ephemeral"
|
||||
- name: Tag Heat Engine image
|
||||
import_role:
|
||||
name: tripleo_container_tag
|
||||
vars:
|
||||
container_image: {get_param: ContainerHeatEngineImage}
|
||||
container_image: {get_attr: [RoleParametersValue, value, ContainerHeatEngineImage]}
|
||||
container_image_latest: "localhost/tripleo/openstack-heat-engine:ephemeral"
|
||||
- name: Tag Heat Api image
|
||||
import_role:
|
||||
name: tripleo_container_tag
|
||||
vars:
|
||||
container_image: {get_param: ContainerHeatApiImage}
|
||||
container_image: {get_attr: [RoleParametersValue, value, ContainerHeatApiImage]}
|
||||
container_image_latest: "localhost/tripleo/openstack-heat-api:ephemeral"
|
||||
external_deploy_tasks:
|
||||
- name: Manage clouds.yaml file for ephemeral Heat
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerHorizonImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerHorizonConfigImage:
|
||||
description: The container image to use for the horizon config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -170,6 +174,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerHorizonImage: ContainerHorizonImage
|
||||
ContainerHorizonConfigImage: ContainerHorizonConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerHorizonImage: {get_param: ContainerHorizonImage}
|
||||
ContainerHorizonConfigImage: {get_param: ContainerHorizonConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Horizon API role.
|
||||
|
|
@ -258,7 +276,7 @@ outputs:
|
|||
puppet_tags: horizon_config
|
||||
step_config: |
|
||||
include tripleo::profile::base::horizon
|
||||
config_image: {get_param: ContainerHorizonConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerHorizonConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/horizon.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -296,7 +314,7 @@ outputs:
|
|||
docker_config:
|
||||
step_2:
|
||||
horizon_fix_perms:
|
||||
image: &horizon_image {get_param: ContainerHorizonImage}
|
||||
image: &horizon_image {get_attr: [RoleParametersValue, value, ContainerHorizonImage]}
|
||||
net: none
|
||||
user: root
|
||||
# NOTE Set ownership for /var/log/horizon/horizon.log file here,
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerIronicApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerIronicApiConfigImage:
|
||||
description: The container image to use for the ironic_api config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -125,6 +129,20 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerIronicApiImage: ContainerIronicApiImage
|
||||
ContainerIronicApiConfigImage: ContainerIronicApiConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerIronicApiImage: {get_param: ContainerIronicApiImage}
|
||||
ContainerIronicApiConfigImage: {get_param: ContainerIronicApiConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Ironic API role.
|
||||
|
|
@ -239,7 +257,7 @@ outputs:
|
|||
- "\n"
|
||||
- - include tripleo::profile::base::ironic::api
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerIronicApiConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerIronicApiConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/ironic_api.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -268,7 +286,7 @@ outputs:
|
|||
# db sync runs before permissions set by kolla_config
|
||||
step_2:
|
||||
ironic_init_logs:
|
||||
image: &ironic_api_image {get_param: ContainerIronicApiImage}
|
||||
image: &ironic_api_image {get_attr: [RoleParametersValue, value, ContainerIronicApiImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerIronicConductorImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerIronicConfigImage:
|
||||
description: The container image to use for the ironic config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -353,12 +357,16 @@ resources:
|
|||
- ironic::conductor::cleaning_network: IronicCleaningNetwork
|
||||
ironic::conductor::provisioning_network: IronicProvisioningNetwork
|
||||
ironic::conductor::rescuing_network: IronicRescuingNetwork
|
||||
ContainerIronicConductorImage: ContainerIronicConductorImage
|
||||
ContainerIronicConfigImage: ContainerIronicConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
IronicConductorGroup: {get_param: IronicConductorGroup}
|
||||
IronicProvisioningNetwork: {get_param: IronicProvisioningNetwork}
|
||||
IronicCleaningNetwork: {get_param: IronicCleaningNetwork}
|
||||
IronicRescuingNetwork: {get_param: IronicRescuingNetwork}
|
||||
ContainerIronicConductorImage: {get_param: ContainerIronicConductorImage}
|
||||
ContainerIronicConfigImage: {get_param: ContainerIronicConfigImage}
|
||||
|
||||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
|
@ -576,7 +584,7 @@ outputs:
|
|||
- "\n"
|
||||
- - include tripleo::profile::base::ironic::conductor
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerIronicConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerIronicConfigImage]}
|
||||
volumes:
|
||||
- /var/lib/ironic:/var/lib/ironic:z
|
||||
kolla_config:
|
||||
|
|
@ -635,7 +643,7 @@ outputs:
|
|||
if:
|
||||
- {get_param: IronicConfigureSwiftTempUrlKey}
|
||||
- start_order: 70
|
||||
image: &ironic_conductor_image {get_param: ContainerIronicConductorImage}
|
||||
image: &ironic_conductor_image {get_attr: [RoleParametersValue, value, ContainerIronicConductorImage]}
|
||||
net: host
|
||||
detach: false
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerIronicInspectorImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerIronicInspectorConfigImage:
|
||||
description: The container image to use for the ironic_inspector config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -225,6 +229,20 @@ resources:
|
|||
MySQLClient:
|
||||
type: ../database/mysql-client.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerIronicInspectorImage: ContainerIronicInspectorImage
|
||||
ContainerIronicInspectorConfigImage: ContainerIronicInspectorConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerIronicInspectorImage: {get_param: ContainerIronicInspectorImage}
|
||||
ContainerIronicInspectorConfigImage: {get_param: ContainerIronicInspectorConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Ironic Inspector role.
|
||||
|
|
@ -398,7 +416,7 @@ outputs:
|
|||
- "\n"
|
||||
- - include tripleo::profile::base::ironic_inspector
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerIronicInspectorConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerIronicInspectorConfigImage]}
|
||||
volumes:
|
||||
- /var/lib/ironic:/var/lib/ironic:z
|
||||
- /var/lib/ironic-inspector/dhcp-hostsdir:/var/lib/ironic-inspector/dhcp-hostsdir:z
|
||||
|
|
@ -443,7 +461,7 @@ outputs:
|
|||
ironic_inspector_init_log:
|
||||
start_order: 0
|
||||
image: &ironic_inspector_image
|
||||
get_param: ContainerIronicInspectorImage
|
||||
get_attr: [RoleParametersValue, value, ContainerIronicInspectorImage]
|
||||
net: none
|
||||
user: root
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerIronicNeutronAgentImage:
|
||||
description: The container image to use for the ironic-neutron-agent
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
|
|
@ -79,6 +83,20 @@ resources:
|
|||
properties:
|
||||
NeutronServiceName: ironic-neutron-agent
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerIronicNeutronAgentImage: ContainerIronicNeutronAgentImage
|
||||
ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerIronicNeutronAgentImage: {get_param: ContainerIronicNeutronAgentImage}
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for ironic-neutron-agent service
|
||||
|
|
@ -109,7 +127,7 @@ outputs:
|
|||
puppet_tags: neutron_config,ironic_neutron_agent_config
|
||||
step_config:
|
||||
include tripleo::profile::base::neutron::agents::networking_baremetal
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/ironic_neutron_agent.json:
|
||||
command: /usr/bin/ironic-neutron-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ironic_neutron_agent.ini --config-dir /etc/neutron/conf.d/common
|
||||
|
|
@ -126,7 +144,7 @@ outputs:
|
|||
step_4:
|
||||
ironic_neutron_agent:
|
||||
start_order: 80
|
||||
image: {get_param: ContainerIronicNeutronAgentImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerIronicNeutronAgentImage]}
|
||||
net: host
|
||||
pid: host
|
||||
privileged: true
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerIronicPxeImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerIronicConfigImage:
|
||||
description: The container image to use for the ironic config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -38,6 +42,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerIronicPxeImage: ContainerIronicPxeImage
|
||||
ContainerIronicConfigImage: ContainerIronicConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerIronicPxeImage: {get_param: ContainerIronicPxeImage}
|
||||
ContainerIronicConfigImage: {get_param: ContainerIronicConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Ironic PXE role.
|
||||
|
|
@ -50,7 +68,7 @@ outputs:
|
|||
config_volume: ironic
|
||||
puppet_tags: ironic_config
|
||||
step_config: ''
|
||||
config_image: {get_param: ContainerIronicConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerIronicConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/ironic_pxe_http.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -121,7 +139,7 @@ outputs:
|
|||
step_4:
|
||||
ironic_pxe_tftp:
|
||||
start_order: 90
|
||||
image: &ironic_pxe_image {get_param: ContainerIronicPxeImage}
|
||||
image: &ironic_pxe_image {get_attr: [RoleParametersValue, value, ContainerIronicPxeImage]}
|
||||
command: ['/bin/bash', '-c', 'BIND_HOST=$(hiera ironic::pxe::tftp_bind_host -c /etc/puppet/hiera.yaml); /usr/sbin/dnsmasq --keep-in-foreground --log-facility=/var/log/ironic/dnsmasq.log --user=root --conf-file=/dev/null --listen-address=$BIND_HOST --port=0 --enable-tftp --tftp-root=/var/lib/ironic/tftpboot']
|
||||
net: host
|
||||
cap_add:
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerIscsidImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerIscsidConfigImage:
|
||||
description: The container image to use for the iscsid config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -81,11 +85,15 @@ resources:
|
|||
- tripleo_tripleo_lvmfilter_enabled: LVMFilterEnabled
|
||||
tripleo_tripleo_lvmfilter_devices_allowlist: LVMFilterAllowlist
|
||||
tripleo_tripleo_lvmfilter_devices_denylist: LVMFilterDenylist
|
||||
ContainerIscsidImage: ContainerIscsidImage
|
||||
ContainerIscsidConfigImage: ContainerIscsidConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
LVMFilterEnabled: {get_param: LVMFilterEnabled}
|
||||
LVMFilterAllowlist: {get_param: LVMFilterAllowlist}
|
||||
LVMFilterDenylist: {get_param: LVMFilterDenylist}
|
||||
ContainerIscsidImage: {get_param: ContainerIscsidImage}
|
||||
ContainerIscsidConfigImage: {get_param: ContainerIscsidConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
|
|
@ -108,7 +116,7 @@ outputs:
|
|||
puppet_tags: iscsid_config
|
||||
step_config: |
|
||||
include tripleo::profile::base::iscsid
|
||||
config_image: {get_param: ContainerIscsidConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerIscsidConfigImage]}
|
||||
volumes:
|
||||
# NOTE(bogdando) Containerized or running on baremetal services
|
||||
# on a node must use the same iSCSI Qualified Name (IQN).
|
||||
|
|
@ -132,7 +140,7 @@ outputs:
|
|||
step_3:
|
||||
iscsid:
|
||||
start_order: 2
|
||||
image: {get_param: ContainerIscsidImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerIscsidImage]}
|
||||
net: host
|
||||
privileged: true
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerKeystoneImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerKeystoneConfigImage:
|
||||
description: The container image to use for the keystone config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -433,6 +437,20 @@ resources:
|
|||
KeystoneLogging:
|
||||
type: OS::TripleO::Services::Logging::Keystone
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerKeystoneImage: ContainerKeystoneImage
|
||||
ContainerKeystoneConfigImage: ContainerKeystoneConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerKeystoneImage: {get_param: ContainerKeystoneImage}
|
||||
ContainerKeystoneConfigImage: {get_param: ContainerKeystoneConfigImage}
|
||||
|
||||
conditions:
|
||||
public_tls_enabled:
|
||||
and:
|
||||
|
|
@ -693,7 +711,7 @@ outputs:
|
|||
- |
|
||||
include tripleo::profile::base::keystone
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: &keystone_config_image {get_param: ContainerKeystoneConfigImage}
|
||||
config_image: &keystone_config_image {get_attr: [RoleParametersValue, value, ContainerKeystoneConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/keystone.json:
|
||||
command: /usr/sbin/httpd
|
||||
|
|
@ -729,7 +747,7 @@ outputs:
|
|||
get_attr: [KeystoneLogging, docker_config, step_2]
|
||||
step_3:
|
||||
keystone_db_sync:
|
||||
image: &keystone_image {get_param: ContainerKeystoneImage}
|
||||
image: &keystone_image {get_attr: [RoleParametersValue, value, ContainerKeystoneImage]}
|
||||
net: host
|
||||
user: root
|
||||
privileged: false
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
OpenStack containerized Barbican API service
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerBarbicanApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerBarbicanApiImage: ContainerBarbicanApiImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerBarbicanApiImage: {get_param: ContainerBarbicanApiImage}
|
||||
|
||||
outputs:
|
||||
cmd_extra_args:
|
||||
|
|
@ -25,7 +45,7 @@ outputs:
|
|||
value:
|
||||
step_2:
|
||||
barbican_init_log:
|
||||
image: {get_param: ContainerBarbicanApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerBarbicanApiImage]}
|
||||
net: none
|
||||
user: root
|
||||
volumes: *barbican_api_volumes
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
OpenStack containerized Glance API service
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerGlanceApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerGlanceApiImage: ContainerGlanceApiImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerGlanceApiImage: {get_param: ContainerGlanceApiImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -23,7 +43,7 @@ outputs:
|
|||
# Kolla_bootstrap/db_sync runs before permissions set by kolla_config
|
||||
step_2:
|
||||
glance_init_logs:
|
||||
image: {get_param: ContainerGlanceApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerGlanceApiImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
OpenStack containerized Glance API service
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerHeatEngineImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerHeatEngineImage: ContainerHeatEngineImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerHeatEngineImage: {get_param: ContainerHeatEngineImage}
|
||||
|
||||
outputs:
|
||||
cmd_extra_args:
|
||||
|
|
@ -21,7 +41,7 @@ outputs:
|
|||
# Kolla_bootstrap/db_sync runs before permissions set by kolla_config
|
||||
step_2:
|
||||
heat_init_log:
|
||||
image: {get_param: ContainerHeatEngineImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHeatEngineImage]}
|
||||
net: none
|
||||
user: root
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
OpenStack containerized Keystone service
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerKeystoneImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerKeystoneImage: ContainerKeystoneImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerKeystoneImage: {get_param: ContainerKeystoneImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -23,7 +43,7 @@ outputs:
|
|||
step_2:
|
||||
keystone_init_log:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerKeystoneImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerKeystoneImage]}
|
||||
net: none
|
||||
user: root
|
||||
command: ['/bin/bash', '-c', 'chown -R keystone:keystone /var/log/keystone']
|
||||
|
|
|
|||
|
|
@ -4,13 +4,33 @@ description: >
|
|||
OpenStack containerized Neutron API service
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerNeutronApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
NeutronServiceName:
|
||||
description: service name
|
||||
type: string
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronApiImage: ContainerNeutronApiImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronApiImage: {get_param: ContainerNeutronApiImage}
|
||||
|
||||
outputs:
|
||||
cmd_extra_args:
|
||||
description: Extra command line arguments for running the service in the container.
|
||||
|
|
@ -33,7 +53,7 @@ outputs:
|
|||
# db sync runs before permissions set by kolla_config
|
||||
step_2:
|
||||
neutron_init_logs:
|
||||
image: {get_param: ContainerNeutronApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronApiImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -4,9 +4,15 @@ description: >
|
|||
Template for nova-api's logging to files
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerNovaApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
DeployIdentifier:
|
||||
default: ''
|
||||
type: string
|
||||
|
|
@ -14,6 +20,20 @@ parameters:
|
|||
Setting this to a unique value will re-run any deployment tasks which
|
||||
perform configuration on a Heat stack-update.
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNovaApiImage: ContainerNovaApiImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNovaApiImage: {get_param: ContainerNovaApiImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
description: Extra hieradata needed to log to files in the host.
|
||||
|
|
@ -29,7 +49,7 @@ outputs:
|
|||
step_2:
|
||||
# db sync runs before permissions set by kolla_config
|
||||
nova_api_init_logs:
|
||||
image: {get_param: ContainerNovaApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaApiImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -4,9 +4,15 @@ description: >
|
|||
Template for nova's logging to files
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerNovaImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
NovaServiceName:
|
||||
description: service name
|
||||
type: string
|
||||
|
|
@ -29,6 +35,17 @@ resources:
|
|||
params:
|
||||
SERVICE: {get_param: NovaServiceName}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNovaImage: ContainerNovaImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNovaImage: {get_param: ContainerNovaImage}
|
||||
outputs:
|
||||
cmd_extra_args:
|
||||
description: Extra command line arguments for running the service in the container.
|
||||
|
|
@ -46,7 +63,7 @@ outputs:
|
|||
step_2:
|
||||
map_replace:
|
||||
- CONTAINERNAME:
|
||||
image: {get_param: ContainerNovaImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
Template for nova-metadata's logging to files
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerNovaMetadataImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNovaMetadataImage: ContainerNovaMetadataImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNovaMetadataImage: {get_param: ContainerNovaMetadataImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -22,7 +42,7 @@ outputs:
|
|||
value:
|
||||
step_2:
|
||||
nova_metadata_init_logs:
|
||||
image: {get_param: ContainerNovaMetadataImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaMetadataImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
Template for placement's logging to files
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerPlacementImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerPlacementImage: ContainerPlacementImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerPlacementImage: {get_param: ContainerPlacementImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -23,7 +43,7 @@ outputs:
|
|||
step_2:
|
||||
placement_init_log:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerPlacementImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerPlacementImage]}
|
||||
net: none
|
||||
user: root
|
||||
command: ['/bin/bash', '-c', 'chown -R placement:placement /var/log/placement']
|
||||
|
|
|
|||
|
|
@ -8,9 +8,13 @@ parameters:
|
|||
ContainerRsyslogImage:
|
||||
description: The container image to use for container
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerRsyslogConfigImage:
|
||||
description: The container image to use for the rsyslog config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -80,6 +84,19 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerRsyslogImage: ContainerRsyslogImage
|
||||
ContainerRsyslogConfigImage: ContainerRsyslogConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerRsyslogImage: {get_param: ContainerRsyslogImage}
|
||||
ContainerRsyslogConfigImage: {get_param: ContainerRsyslogConfigImage}
|
||||
conditions:
|
||||
use_tls:
|
||||
not:
|
||||
|
|
@ -251,7 +268,7 @@ outputs:
|
|||
config_volume: rsyslog
|
||||
puppet_tags: 'rsyslog::generate_concat,concat::fragment'
|
||||
step_config: include tripleo::profile::base::logging::rsyslog
|
||||
config_image: {get_param: ContainerRsyslogConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerRsyslogConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/rsyslog.json:
|
||||
command: /usr/sbin/rsyslogd -n
|
||||
|
|
@ -270,7 +287,7 @@ outputs:
|
|||
docker_config:
|
||||
step_3:
|
||||
rsyslog:
|
||||
image: {get_param: ContainerRsyslogImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerRsyslogImage]}
|
||||
net: host
|
||||
privileged: true
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ parameters:
|
|||
ContainerRsyslogSidecarConfigImage:
|
||||
description: The container image to use for the rsyslog-sidecar config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -35,6 +37,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerRsyslogSidecarImage: ContainerRsyslogSidecarImage
|
||||
ContainerRsyslogSidecarConfigImage: ContainerRsyslogSidecarConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerRsyslogSidecarImage: {get_param: ContainerRsyslogSidecarImage}
|
||||
ContainerRsyslogSidecarConfigImage: {get_param: ContainerRsyslogSidecarConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the rsyslog-sidecar role.
|
||||
|
|
@ -47,7 +63,7 @@ outputs:
|
|||
puppet_tags: file
|
||||
step_config: |
|
||||
include tripleo::profile::base::rsyslog::sidecar
|
||||
config_image: {get_param: ContainerRsyslogSidecarConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerRsyslogSidecarConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/rsyslog_sidecar.json:
|
||||
command: /usr/sbin/rsyslogd -n
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
OpenStack containerized Barbican service
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerBarbicanApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerBarbicanApiImage: ContainerBarbicanApiImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerBarbicanApiImage: {get_param: ContainerBarbicanApiImage}
|
||||
|
||||
outputs:
|
||||
cmd_extra_args:
|
||||
|
|
@ -23,7 +43,7 @@ outputs:
|
|||
step_2:
|
||||
barbican_api_apache_error_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerBarbicanApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerBarbicanApiImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -34,7 +54,7 @@ outputs:
|
|||
- BarbicanApiLogs:/var/log/
|
||||
barbican_api_apache_access_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerBarbicanApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerBarbicanApiImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -45,7 +65,7 @@ outputs:
|
|||
- BarbicanApiLogs:/var/log/
|
||||
barbican_api_logs:
|
||||
start_order: 2
|
||||
image: {get_param: ContainerBarbicanApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerBarbicanApiImage]}
|
||||
user: barbican
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
OpenStack containerized HAProxy API service
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerRsyslogSidecarImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerRsyslogSidecarImage: ContainerRsyslogSidecarImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerRsyslogSidecarImage: {get_param: ContainerRsyslogSidecarImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -19,7 +39,7 @@ outputs:
|
|||
step_1:
|
||||
haproxy_logs:
|
||||
start_order: 0
|
||||
image: {get_param: ContainerRsyslogSidecarImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerRsyslogSidecarImage]}
|
||||
user: root
|
||||
restart: always
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
OpenStack containerized Heat API CFN service
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerHeatApiCfnImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerHeatApiCfnImage: ContainerHeatApiCfnImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerHeatApiCfnImage: {get_param: ContainerHeatApiCfnImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -20,7 +40,7 @@ outputs:
|
|||
step_2:
|
||||
heat_api_cfn_apache_error_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerHeatApiCfnImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHeatApiCfnImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -31,7 +51,7 @@ outputs:
|
|||
- HeatApiCfnLogs:/var/log/
|
||||
heat_api_cfn_apache_access_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerHeatApiCfnImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHeatApiCfnImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -42,7 +62,7 @@ outputs:
|
|||
- HeatApiCfnLogs:/var/log/
|
||||
heat_api_cfn_logs:
|
||||
start_order: 2
|
||||
image: {get_param: ContainerHeatApiCfnImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHeatApiCfnImage]}
|
||||
user: heat
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
OpenStack containerized Heat API service
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerHeatApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerHeatApiImage: ContainerHeatApiImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerHeatApiImage: {get_param: ContainerHeatApiImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -20,7 +40,7 @@ outputs:
|
|||
step_2:
|
||||
heat_api_apache_error_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerHeatApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHeatApiImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -31,7 +51,7 @@ outputs:
|
|||
- HeatApiLogs:/var/log/
|
||||
heat_api_apache_access_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerHeatApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHeatApiImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -42,7 +62,7 @@ outputs:
|
|||
- HeatApiLogs:/var/log/
|
||||
heat_api_logs:
|
||||
start_order: 2
|
||||
image: {get_param: ContainerHeatApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerHeatApiImage]}
|
||||
user: heat
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
OpenStack containerized Keystone service
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerKeystoneImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerKeystoneImage: ContainerKeystoneImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerKeystoneImage: {get_param: ContainerKeystoneImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -20,7 +40,7 @@ outputs:
|
|||
step_2:
|
||||
keystone_apache_error_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerKeystoneImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerKeystoneImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -31,7 +51,7 @@ outputs:
|
|||
- KeystoneLogs:/var/log/
|
||||
keystone_apache_access_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerKeystoneImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerKeystoneImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -42,7 +62,7 @@ outputs:
|
|||
- KeystoneLogs:/var/log/
|
||||
keystone_logs:
|
||||
start_order: 2
|
||||
image: {get_param: ContainerKeystoneImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerKeystoneImage]}
|
||||
user: keystone
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
Template for nova-api's logging to stdout
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerNovaApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNovaApiImage: ContainerNovaApiImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNovaApiImage: {get_param: ContainerNovaApiImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -24,7 +44,7 @@ outputs:
|
|||
step_2:
|
||||
nova_api_apache_error_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerNovaApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaApiImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -35,7 +55,7 @@ outputs:
|
|||
- NovaApiLogs:/var/log/
|
||||
nova_api_apache_access_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerNovaApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaApiImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -46,7 +66,7 @@ outputs:
|
|||
- NovaApiLogs:/var/log/
|
||||
nova_api_logs:
|
||||
start_order: 2
|
||||
image: {get_param: ContainerNovaApiImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaApiImage]}
|
||||
user: nova
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ parameters:
|
|||
ContainerNovaImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
NovaServiceName:
|
||||
description: service name
|
||||
type: string
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
Template for nova-metadata's logging to stdout
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerNovaMetadataImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNovaMetadataImage: ContainerNovaMetadataImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNovaMetadataImage: {get_param: ContainerNovaMetadataImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -24,7 +44,7 @@ outputs:
|
|||
step_2:
|
||||
nova_metadata_apache_error_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerNovaMetadataImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaMetadataImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -35,7 +55,7 @@ outputs:
|
|||
- NovaMetadataLogs:/var/log/
|
||||
nova_metadata_apache_access_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerNovaMetadataImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaMetadataImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -46,7 +66,7 @@ outputs:
|
|||
- NovaMetadataLogs:/var/log/
|
||||
nova_metadata_logs:
|
||||
start_order: 2
|
||||
image: {get_param: ContainerNovaMetadataImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNovaMetadataImage]}
|
||||
user: nova
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -4,9 +4,29 @@ description: >
|
|||
Template for placement's logging to stdout
|
||||
|
||||
parameters:
|
||||
RoleParameters:
|
||||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
ContainerPlacementImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerPlacementImage: ContainerPlacementImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerPlacementImage: {get_param: ContainerPlacementImage}
|
||||
|
||||
outputs:
|
||||
config_settings:
|
||||
|
|
@ -24,7 +44,7 @@ outputs:
|
|||
step_2:
|
||||
placement_apache_error_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerPlacementImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerPlacementImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -35,7 +55,7 @@ outputs:
|
|||
- PlacementLogs:/var/log/
|
||||
placement_apache_access_logs:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerPlacementImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerPlacementImage]}
|
||||
user: root
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
@ -46,7 +66,7 @@ outputs:
|
|||
- PlacementLogs:/var/log/
|
||||
placement_logs:
|
||||
start_order: 2
|
||||
image: {get_param: ContainerPlacementImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerPlacementImage]}
|
||||
user: placement
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCrondImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCrondConfigImage:
|
||||
description: The container image to use for the crond config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -73,6 +77,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCrondImage: ContainerCrondImage
|
||||
ContainerCrondConfigImage: ContainerCrondConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCrondImage: {get_param: ContainerCrondImage}
|
||||
ContainerCrondConfigImage: {get_param: ContainerCrondConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the crond role.
|
||||
|
|
@ -132,7 +150,7 @@ outputs:
|
|||
puppet_config:
|
||||
config_volume: crond
|
||||
step_config: 'include tripleo::profile::base::logging::logrotate'
|
||||
config_image: {get_param: ContainerCrondConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCrondConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/logrotate-crond.json:
|
||||
command: /usr/sbin/crond -s -n
|
||||
|
|
@ -144,7 +162,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
logrotate_crond:
|
||||
image: {get_param: ContainerCrondImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerCrondImage]}
|
||||
net: none
|
||||
pid: host
|
||||
privileged: true
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerManilaApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerManilaConfigImage:
|
||||
description: The container image to use for the manila config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -134,6 +138,20 @@ resources:
|
|||
RoleParameters: {get_param: RoleParameters}
|
||||
EnableInternalTLS: {get_param: EnableInternalTLS}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerManilaApiImage: ContainerManilaApiImage
|
||||
ContainerManilaConfigImage: ContainerManilaConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerManilaApiImage: {get_param: ContainerManilaApiImage}
|
||||
ContainerManilaConfigImage: {get_param: ContainerManilaConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Manila API role.
|
||||
|
|
@ -234,7 +252,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::manila::api"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerManilaConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerManilaConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/manila_api.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -273,7 +291,7 @@ outputs:
|
|||
docker_config:
|
||||
step_2:
|
||||
manila_init_logs:
|
||||
image: &manila_api_image {get_param: ContainerManilaApiImage}
|
||||
image: &manila_api_image {get_attr: [RoleParametersValue, value, ContainerManilaApiImage]}
|
||||
net: none
|
||||
user: root
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerManilaSchedulerImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerManilaConfigImage:
|
||||
description: The container image to use for the manila config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -51,6 +55,20 @@ resources:
|
|||
ServiceData: {get_param: ServiceData}
|
||||
ServiceNetMap: {get_param: ServiceNetMap}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerManilaSchedulerImage: ContainerManilaSchedulerImage
|
||||
ContainerManilaConfigImage: ContainerManilaConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerManilaSchedulerImage: {get_param: ContainerManilaSchedulerImage}
|
||||
ContainerManilaConfigImage: {get_param: ContainerManilaConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Manila Scheduler role.
|
||||
|
|
@ -68,7 +86,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::manila::scheduler"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerManilaConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerManilaConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/manila_scheduler.json:
|
||||
command: /usr/bin/manila-scheduler --config-file /etc/manila/manila.conf
|
||||
|
|
@ -84,7 +102,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
manila_scheduler:
|
||||
image: {get_param: ContainerManilaSchedulerImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerManilaSchedulerImage]}
|
||||
net: host
|
||||
restart: always
|
||||
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerManilaShareImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerManilaConfigImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -81,6 +85,20 @@ resources:
|
|||
ManilaShareCommon:
|
||||
type: ./manila-share-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerManilaShareImage: ContainerManilaShareImage
|
||||
ContainerManilaConfigImage: ContainerManilaConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerManilaShareImage: {get_param: ContainerManilaShareImage}
|
||||
ContainerManilaConfigImage: {get_param: ContainerManilaConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Manila Share role.
|
||||
|
|
@ -140,7 +158,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::base::manila::share"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerManilaConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerManilaConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/manila_share.json:
|
||||
command: /usr/bin/manila-share --config-file /etc/manila/manila.conf
|
||||
|
|
@ -171,7 +189,7 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
manila_share:
|
||||
image: &manila_share_image {get_param: ContainerManilaShareImage}
|
||||
image: &manila_share_image {get_attr: [RoleParametersValue, value, ContainerManilaShareImage]}
|
||||
net: host
|
||||
ipc: host
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerManilaShareImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerManilaConfigImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
|
|
@ -88,6 +92,20 @@ resources:
|
|||
ManilaCommon:
|
||||
type: ./manila-share-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerManilaShareImage: ContainerManilaShareImage
|
||||
ContainerManilaConfigImage: ContainerManilaConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerManilaShareImage: {get_param: ContainerManilaShareImage}
|
||||
ContainerManilaConfigImage: {get_param: ContainerManilaConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Manila Share role.
|
||||
|
|
@ -105,9 +123,9 @@ outputs:
|
|||
if:
|
||||
- {get_param: ClusterCommonTag}
|
||||
- yaql:
|
||||
data: {get_param: ContainerManilaShareImage}
|
||||
data: {get_attr: [RoleParametersValue, value, ContainerManilaShareImage]}
|
||||
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: ContainerManilaShareImage}
|
||||
- {get_attr: [RoleParametersValue, value, ContainerManilaShareImage]}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::manila::share_bundle::docker_volumes: {get_attr: [ManilaCommon, manila_share_volumes]}
|
||||
tripleo::profile::pacemaker::manila::share_bundle::docker_environment: {get_attr: [ManilaCommon, manila_share_environment]}
|
||||
|
|
@ -126,7 +144,7 @@ outputs:
|
|||
- "\n"
|
||||
- - "include tripleo::profile::pacemaker::manila::share_bundle"
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerManilaConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerManilaConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/manila_share.json:
|
||||
command: /usr/bin/manila-share --config-file /etc/manila/manila.conf
|
||||
|
|
@ -148,7 +166,7 @@ outputs:
|
|||
step_3:
|
||||
manila_share_init_logs:
|
||||
start_order: 0
|
||||
image: {get_param: ContainerManilaShareImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerManilaShareImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
@ -175,7 +193,7 @@ outputs:
|
|||
import_role:
|
||||
name: tripleo_container_tag
|
||||
vars:
|
||||
container_image: {get_param: ContainerManilaShareImage}
|
||||
container_image: {get_attr: [RoleParametersValue, value, ContainerManilaShareImage]}
|
||||
container_image_latest: *manila_share_image_pcmklatest
|
||||
- name: Manila-Share HA Wrappers Step
|
||||
when: step|int == 5
|
||||
|
|
@ -199,7 +217,7 @@ outputs:
|
|||
block: &manila_share_fetch_retag_container_tasks
|
||||
- name: Get container manila_share image
|
||||
set_fact:
|
||||
manila_share_image: {get_param: ContainerManilaShareImage}
|
||||
manila_share_image: {get_attr: [RoleParametersValue, value, ContainerManilaShareImage]}
|
||||
manila_share_image_latest: *manila_share_image_pcmklatest
|
||||
- name: Pull latest manila_share images
|
||||
command: "{{container_cli}} pull {{manila_share_image}}"
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerMemcachedImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerMemcachedConfigImage:
|
||||
description: The container image to use for the memcached config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -111,6 +115,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerMemcachedImage: ContainerMemcachedImage
|
||||
ContainerMemcachedConfigImage: ContainerMemcachedConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerMemcachedImage: {get_param: ContainerMemcachedImage}
|
||||
ContainerMemcachedConfigImage: {get_param: ContainerMemcachedConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Memcached API role.
|
||||
|
|
@ -256,7 +274,7 @@ outputs:
|
|||
puppet_tags: 'file'
|
||||
step_config: |
|
||||
include tripleo::profile::base::memcached
|
||||
config_image: {get_param: ContainerMemcachedConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerMemcachedConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/memcached.json:
|
||||
command: bash -c $* -- eval source /etc/sysconfig/memcached; exec /usr/bin/memcached -p ${PORT} -u ${USER} -m ${CACHESIZE} -c ${MAXCONN} $OPTIONS >> /var/log/memcached/memcached.log 2>&1
|
||||
|
|
@ -284,7 +302,7 @@ outputs:
|
|||
step_1:
|
||||
memcached:
|
||||
start_order: 0
|
||||
image: {get_param: ContainerMemcachedImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerMemcachedImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerQdrouterdImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerQdrouterdConfigImage:
|
||||
description: The container image to use for the qdrouterd config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -85,6 +89,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerQdrouterdImage: ContainerQdrouterdImage
|
||||
ContainerQdrouterdConfigImage: ContainerQdrouterdConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerQdrouterdImage: {get_param: ContainerQdrouterdImage}
|
||||
ContainerQdrouterdConfigImage: {get_param: ContainerQdrouterdConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the qdrouterd service.
|
||||
|
|
@ -130,7 +148,7 @@ outputs:
|
|||
config_volume: qdrouterd
|
||||
step_config: |
|
||||
include tripleo::profile::base::qdr
|
||||
config_image: {get_param: ContainerQdrouterdConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerQdrouterdConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/qdrouterd.json:
|
||||
command: /usr/sbin/qdrouterd -c /etc/qpid-dispatch/qdrouterd.conf
|
||||
|
|
@ -160,7 +178,7 @@ outputs:
|
|||
qdrouterd_init_logs:
|
||||
start_order: 0
|
||||
detach: false
|
||||
image: &qdrouterd_image {get_param: ContainerQdrouterdImage}
|
||||
image: &qdrouterd_image {get_attr: [RoleParametersValue, value, ContainerQdrouterdImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -6,9 +6,13 @@ parameters:
|
|||
ContainerCollectdImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCollectdConfigImage:
|
||||
description: The container image to use for the collectd config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -356,6 +360,20 @@ resources:
|
|||
- {get_param: [RoleParameters, CollectdVars]}
|
||||
- {}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCollectdImage: ContainerCollectdImage
|
||||
ContainerCollectdConfigImage: ContainerCollectdConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCollectdImage: {get_param: ContainerCollectdImage}
|
||||
ContainerCollectdConfigImage: {get_param: ContainerCollectdConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Collectd service
|
||||
|
|
@ -389,7 +407,7 @@ outputs:
|
|||
docker_config:
|
||||
step_5:
|
||||
collectd:
|
||||
image: {get_param: ContainerCollectdImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerCollectdImage]}
|
||||
net: host
|
||||
pid: host
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerCollectdImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerCollectdConfigImage:
|
||||
description: The container image to use for the collectd config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
|
@ -436,6 +440,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerCollectdImage: ContainerCollectdImage
|
||||
ContainerCollectdConfigImage: ContainerCollectdConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerCollectdImage: {get_param: ContainerCollectdImage}
|
||||
ContainerCollectdConfigImage: {get_param: ContainerCollectdConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the collectd role.
|
||||
|
|
@ -694,7 +712,7 @@ outputs:
|
|||
config_volume: collectd
|
||||
puppet_tags: collectd_client_config,exec
|
||||
step_config: include tripleo::profile::base::metrics::collectd
|
||||
config_image: {get_param: ContainerCollectdConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerCollectdConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/collectd.json:
|
||||
command: /usr/sbin/collectd -f
|
||||
|
|
@ -720,7 +738,7 @@ outputs:
|
|||
docker_config:
|
||||
step_5:
|
||||
collectd:
|
||||
image: {get_param: ContainerCollectdImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerCollectdImage]}
|
||||
net: host
|
||||
pid: host
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ parameters:
|
|||
ContainerMetricsQdrImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
EnableInternalTLS:
|
||||
default: false
|
||||
type: boolean
|
||||
|
|
@ -207,6 +209,17 @@ resources:
|
|||
- {get_param: [RoleParameters, MetricsQdrVars]}
|
||||
- {}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerMetricsQdrImage: ContainerMetricsQdrImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerMetricsQdrImage: {get_param: ContainerMetricsQdrImage}
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the metrics Qdr role.
|
||||
|
|
@ -315,7 +328,7 @@ outputs:
|
|||
healthcheck:
|
||||
test: /openstack/healthcheck
|
||||
image:
|
||||
get_param: ContainerMetricsQdrImage
|
||||
get_attr: [RoleParametersValue, value, ContainerMetricsQdrImage]
|
||||
net: host
|
||||
privileged: false
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerMetricsQdrImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerMetricsQdrConfigImage:
|
||||
description: The container image to use for the qdrouterd config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
|
|
@ -160,6 +164,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerMetricsQdrImage: ContainerMetricsQdrImage
|
||||
ContainerMetricsQdrConfigImage: ContainerMetricsQdrConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerMetricsQdrImage: {get_param: ContainerMetricsQdrImage}
|
||||
ContainerMetricsQdrConfigImage: {get_param: ContainerMetricsQdrConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the metrics Qdr role.
|
||||
|
|
@ -249,7 +267,7 @@ outputs:
|
|||
config_volume: metrics_qdr
|
||||
step_config: |
|
||||
include tripleo::profile::base::metrics::qdr
|
||||
config_image: {get_param: ContainerMetricsQdrConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerMetricsQdrConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/metrics_qdr.json:
|
||||
command: /usr/sbin/qdrouterd -c /etc/qpid-dispatch/qdrouterd.conf
|
||||
|
|
@ -278,7 +296,7 @@ outputs:
|
|||
metrics_qdr_init_logs:
|
||||
start_order: 0
|
||||
detach: false
|
||||
image: &qdrouterd_image {get_param: ContainerMetricsQdrImage}
|
||||
image: &qdrouterd_image {get_attr: [RoleParametersValue, value, ContainerMetricsQdrImage]}
|
||||
net: none
|
||||
privileged: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerMultipathdImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerMultipathdConfigImage:
|
||||
description: The container image to use for the multipathd config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
MultipathdEnable:
|
||||
default: false
|
||||
description: Whether to enable the multipath daemon
|
||||
|
|
@ -66,6 +70,20 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerMultipathdImage: ContainerMultipathdImage
|
||||
ContainerMultipathdConfigImage: ContainerMultipathdConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerMultipathdImage: {get_param: ContainerMultipathdImage}
|
||||
ContainerMultipathdConfigImage: {get_param: ContainerMultipathdConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Multipathd API role.
|
||||
|
|
@ -85,7 +103,7 @@ outputs:
|
|||
step_3:
|
||||
multipathd:
|
||||
start_order: 1
|
||||
image: {get_param: ContainerMultipathdImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerMultipathdImage]}
|
||||
net: host
|
||||
privileged: true
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ parameters:
|
|||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
|
|
@ -69,11 +71,12 @@ resources:
|
|||
- map_replace:
|
||||
- neutron::agents::ml2::mlnx::multi_interface_driver_mappings: MultiInterfaceDriverMappings
|
||||
neutron::agents::ml2::mlnx::ipoib_physical_interface : IPoIBPhysicalInterface
|
||||
ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
MultiInterfaceDriverMappings: {get_param: MultiInterfaceDriverMappings}
|
||||
IPoIBPhysicalInterface: {get_param: IPoIBPhysicalInterface}
|
||||
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for Neutron agents IB config
|
||||
|
|
@ -93,7 +96,7 @@ outputs:
|
|||
step_3:
|
||||
neutron_agents_ib_config:
|
||||
detach: false
|
||||
image: {get_param: ContainerNeutronConfigImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
net: host
|
||||
pid: host
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerNeutronApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
NeutronApiLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -282,6 +286,20 @@ resources:
|
|||
properties:
|
||||
NeutronServiceName: server
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronApiImage: ContainerNeutronApiImage
|
||||
ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronApiImage: {get_param: ContainerNeutronApiImage}
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Neutron API role.
|
||||
|
|
@ -459,7 +477,7 @@ outputs:
|
|||
- "\n"
|
||||
- - include tripleo::profile::base::neutron::server
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/neutron_api.json:
|
||||
command:
|
||||
|
|
@ -516,7 +534,7 @@ outputs:
|
|||
get_attr: [NeutronLogging, docker_config, step_2]
|
||||
step_3:
|
||||
neutron_db_sync:
|
||||
image: &neutron_api_image {get_param: ContainerNeutronApiImage}
|
||||
image: &neutron_api_image {get_attr: [RoleParametersValue, value, ContainerNeutronApiImage]}
|
||||
net: host
|
||||
privileged: false
|
||||
detach: false
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ parameters:
|
|||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
BgpvpnServiceProvider:
|
||||
default: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
|
||||
description: Backend to use as a service provider for BGPVPN
|
||||
|
|
@ -39,6 +41,18 @@ resources:
|
|||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the BGPVPN role.
|
||||
|
|
@ -52,6 +66,6 @@ outputs:
|
|||
puppet_tags: neutron_bgpvpn_service_config
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::bgpvpn
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config: {}
|
||||
docker_config: {}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerNeutronDHCPImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
DockerNeutronDHCPAgentUlimit:
|
||||
default: ['nofile=16384']
|
||||
description: ulimit for Neutron DHCP Agent Container
|
||||
|
|
@ -169,6 +173,20 @@ resources:
|
|||
properties:
|
||||
NeutronServiceName: dhcp-agent
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronDHCPImage: ContainerNeutronDHCPImage
|
||||
ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronDHCPImage: {get_param: ContainerNeutronDHCPImage}
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Neutron DHCP role.
|
||||
|
|
@ -205,10 +223,10 @@ outputs:
|
|||
- get_attr: [NeutronLogging, config_settings]
|
||||
- tripleo::profile::base::neutron::dhcp_agent_wrappers::enable_dnsmasq_wrapper: {get_param: NeutronEnableDnsmasqDockerWrapper}
|
||||
tripleo::profile::base::neutron::dhcp_agent_wrappers::dnsmasq_process_wrapper: '/var/lib/neutron/dnsmasq_wrapper'
|
||||
tripleo::profile::base::neutron::dhcp_agent_wrappers::dnsmasq_image: {get_param: ContainerNeutronDHCPImage}
|
||||
tripleo::profile::base::neutron::dhcp_agent_wrappers::dnsmasq_image: {get_attr: [RoleParametersValue, value, ContainerNeutronDHCPImage]}
|
||||
tripleo::profile::base::neutron::dhcp_agent_wrappers::enable_haproxy_wrapper: {get_param: NeutronEnableHaproxyDockerWrapper}
|
||||
tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_process_wrapper: '/var/lib/neutron/dhcp_haproxy_wrapper'
|
||||
tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_image: {get_param: ContainerNeutronDHCPImage}
|
||||
tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_image: {get_attr: [RoleParametersValue, value, ContainerNeutronDHCPImage]}
|
||||
tripleo::profile::base::neutron::dhcp_agent_wrappers::debug:
|
||||
if:
|
||||
- {get_param: NeutronWrapperDebug}
|
||||
|
|
@ -251,7 +269,7 @@ outputs:
|
|||
puppet_tags: neutron_config,neutron_dhcp_agent_config
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::dhcp
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/neutron_dhcp.json:
|
||||
command:
|
||||
|
|
@ -296,7 +314,7 @@ outputs:
|
|||
- '4'
|
||||
- 'file'
|
||||
- 'include ::tripleo::profile::base::neutron::dhcp_agent_wrappers'
|
||||
image: {get_param: ContainerNeutronDHCPImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronDHCPImage]}
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
|
||||
|
|
@ -306,7 +324,7 @@ outputs:
|
|||
step_4:
|
||||
neutron_dhcp:
|
||||
start_order: 10
|
||||
image: {get_param: ContainerNeutronDHCPImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronDHCPImage]}
|
||||
net: host
|
||||
pid: host
|
||||
cgroupns: host
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ parameters:
|
|||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
L2gwServiceDefaultInterfaceName:
|
||||
default: 'FortyGigE1/0/1'
|
||||
description: default interface name of the L2 gateway
|
||||
|
|
@ -51,6 +53,20 @@ parameters:
|
|||
description: Backend to use as a service provider for L2 Gateway
|
||||
type: comma_delimited_list
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the L2 Gateway role.
|
||||
|
|
@ -68,6 +84,6 @@ outputs:
|
|||
puppet_tags: neutron_l2gw_service_config
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::l2gw
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config: {}
|
||||
docker_config: {}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerNeutronL3AgentImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
DockerNeutronL3AgentUlimit:
|
||||
default: ['nofile=16384']
|
||||
description: ulimit for Neutron L3 Agent Container
|
||||
|
|
@ -172,9 +176,13 @@ resources:
|
|||
map_replace:
|
||||
- map_replace:
|
||||
- neutron::agents::l3::agent_mode: NeutronL3AgentMode
|
||||
ContainerNeutronL3AgentImage: ContainerNeutronL3AgentImage
|
||||
ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
NeutronL3AgentMode: {get_param: NeutronL3AgentMode}
|
||||
ContainerNeutronL3AgentImage: {get_param: ContainerNeutronL3AgentImage}
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
NeutronLogging:
|
||||
type: OS::TripleO::Services::Logging::NeutronCommon
|
||||
|
|
@ -199,16 +207,16 @@ outputs:
|
|||
tripleo::profile::base::neutron::l3_agent_wrappers::keepalived_process_wrapper: '/var/lib/neutron/keepalived_wrapper'
|
||||
# TODO(beagles): this can be removed after a cleanup of the related puppet-tripleo code.
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::keepalived_state_change_wrapper: '/var/lib/neutron/keepalived_state_change_wrapper'
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::keepalived_image: {get_param: ContainerNeutronL3AgentImage}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::keepalived_image: {get_attr: [RoleParametersValue, value, ContainerNeutronL3AgentImage]}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::enable_haproxy_wrapper: {get_param: NeutronEnableHaproxyDockerWrapper}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::haproxy_process_wrapper: '/var/lib/neutron/l3_haproxy_wrapper'
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::haproxy_image: {get_param: ContainerNeutronL3AgentImage}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::haproxy_image: {get_attr: [RoleParametersValue, value, ContainerNeutronL3AgentImage]}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::enable_dibbler_wrapper: {get_param: NeutronEnableDibblerDockerWrapper}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::dibbler_process_wrapper: '/var/lib/neutron/dibbler_wrapper'
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::dibbler_image: {get_param: ContainerNeutronL3AgentImage}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::dibbler_image: {get_attr: [RoleParametersValue, value, ContainerNeutronL3AgentImage]}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::enable_radvd_wrapper: {get_param: NeutronEnableRadvdDockerWrapper}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::radvd_process_wrapper: '/var/lib/neutron/radvd_wrapper'
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::radvd_image: {get_param: ContainerNeutronL3AgentImage}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::radvd_image: {get_attr: [RoleParametersValue, value, ContainerNeutronL3AgentImage]}
|
||||
tripleo::profile::base::neutron::l3_agent_wrappers::debug:
|
||||
if:
|
||||
- {get_param: NeutronWrapperDebug}
|
||||
|
|
@ -243,7 +251,7 @@ outputs:
|
|||
config_volume: neutron
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::l3
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/neutron_l3_agent.json:
|
||||
command:
|
||||
|
|
@ -278,7 +286,7 @@ outputs:
|
|||
- '4'
|
||||
- 'file'
|
||||
- 'include ::tripleo::profile::base::neutron::l3_agent_wrappers'
|
||||
image: {get_param: ContainerNeutronL3AgentImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronL3AgentImage]}
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
|
||||
|
|
@ -287,7 +295,7 @@ outputs:
|
|||
step_4:
|
||||
neutron_l3_agent:
|
||||
start_order: 10
|
||||
image: {get_param: ContainerNeutronL3AgentImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronL3AgentImage]}
|
||||
net: host
|
||||
pid: host
|
||||
privileged: true
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerNeutronMetadataImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
NeutronMetadataAgentLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -92,6 +96,20 @@ resources:
|
|||
properties:
|
||||
NeutronServiceName: metadata-agent
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronMetadataImage: ContainerNeutronMetadataImage
|
||||
ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronMetadataImage: {get_param: ContainerNeutronMetadataImage}
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for Neutron Metadata agent
|
||||
|
|
@ -137,7 +155,7 @@ outputs:
|
|||
config_volume: neutron
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::metadata
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/neutron_metadata_agent.json:
|
||||
command:
|
||||
|
|
@ -161,7 +179,7 @@ outputs:
|
|||
step_4:
|
||||
neutron_metadata_agent:
|
||||
start_order: 10
|
||||
image: {get_param: ContainerNeutronMetadataImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronMetadataImage]}
|
||||
net: host
|
||||
pid: host
|
||||
privileged: true
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerNeutronMlnxImage:
|
||||
description: The container image to use for the Neutron MLNX agent
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
|
|
@ -70,10 +74,14 @@ resources:
|
|||
- map_replace:
|
||||
- neutron::agents::ml2::mlnx::physical_interface_mappings: NeutronPhysicalDevMappings
|
||||
neutron::agents::ml2::mlnx::polling_interval: MlnxAgentPollingInterval
|
||||
ContainerNeutronMlnxImage: ContainerNeutronMlnxImage
|
||||
ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
NeutronPhysicalDevMappings: {get_param: NeutronPhysicalDevMappings}
|
||||
MlnxAgentPollingInterval: {get_param: MlnxAgentPollingInterval}
|
||||
ContainerNeutronMlnxImage: {get_param: ContainerNeutronMlnxImage}
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
|
@ -112,7 +120,7 @@ outputs:
|
|||
puppet_tags: neutron_plugin_ml2
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::plugins::ml2
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/neutron_mlnx_agent.json:
|
||||
command:
|
||||
|
|
@ -148,7 +156,7 @@ outputs:
|
|||
step_3:
|
||||
neutron_mlnx_agent_config:
|
||||
detach: false
|
||||
image: {get_param: ContainerNeutronConfigImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
net: host
|
||||
pid: host
|
||||
user: root
|
||||
|
|
@ -177,7 +185,7 @@ outputs:
|
|||
step_4:
|
||||
neutron_mlnx_agent:
|
||||
start_order: 10
|
||||
image: {get_param: ContainerNeutronMlnxImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronMlnxImage]}
|
||||
net: host
|
||||
pid: host
|
||||
privileged: true
|
||||
|
|
@ -196,7 +204,7 @@ outputs:
|
|||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||
eswitchd:
|
||||
start_order: 10
|
||||
image: {get_param: ContainerNeutronMlnxImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronMlnxImage]}
|
||||
net: host
|
||||
pid: host
|
||||
privileged: true
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerOpenvswitchImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
DockerOpenvswitchUlimit:
|
||||
default: ['nofile=16384']
|
||||
description: ulimit for Openvswitch Container
|
||||
|
|
@ -184,12 +188,16 @@ resources:
|
|||
vswitch::ovs::enable_hw_offload: OvsHwOffload
|
||||
vswitch::ovs::disable_emc: OvsDisableEMC
|
||||
neutron::agents::ml2::ovs::resource_provider_bandwidths: NeutronOvsResourceProviderBandwidths
|
||||
ContainerOpenvswitchImage: ContainerOpenvswitchImage
|
||||
ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
NeutronBridgeMappings: {get_param: NeutronBridgeMappings}
|
||||
OvsHwOffload: {get_param: OvsHwOffload}
|
||||
OvsDisableEMC: {get_param: OvsDisableEMC}
|
||||
NeutronOvsResourceProviderBandwidths: {get_param: NeutronOvsResourceProviderBandwidths}
|
||||
ContainerOpenvswitchImage: {get_param: ContainerOpenvswitchImage}
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
NeutronBase:
|
||||
type: ./neutron-base.yaml
|
||||
|
|
@ -276,7 +284,7 @@ outputs:
|
|||
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::ovs
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
# We need to mount /run for puppet_config step. This is because
|
||||
# puppet-vswitch runs the commands "ovs-vsctl list open_vswitch ."
|
||||
# when running vswitch::ovs::enable_hw_offload: true
|
||||
|
|
@ -323,7 +331,7 @@ outputs:
|
|||
step_3:
|
||||
neutron_ovs_bridge:
|
||||
detach: false
|
||||
image: {get_param: ContainerNeutronConfigImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
net: host
|
||||
pid: host
|
||||
user: root
|
||||
|
|
@ -356,7 +364,7 @@ outputs:
|
|||
step_4:
|
||||
neutron_ovs_agent:
|
||||
start_order: 10
|
||||
image: {get_param: ContainerOpenvswitchImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerOpenvswitchImage]}
|
||||
net: host
|
||||
pid: host
|
||||
privileged: true
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ parameters:
|
|||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
|
|
@ -96,12 +98,14 @@ resources:
|
|||
neutron::agents::ml2::ovs::vhostuser_socket_dir: NeutronVhostuserSocketDir
|
||||
vhostuser_socket_group: VhostuserSocketGroup
|
||||
vhostuser_socket_user: VhostuserSocketUser
|
||||
ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
NeutronDatapathType: {get_param: NeutronDatapathType}
|
||||
NeutronVhostuserSocketDir: {get_param: NeutronVhostuserSocketDir}
|
||||
VhostuserSocketGroup: {get_param: VhostuserSocketGroup}
|
||||
VhostuserSocketUser: {get_param: VhostuserSocketUser}
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
|
|
@ -127,7 +131,7 @@ outputs:
|
|||
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
|
||||
step_config:
|
||||
get_attr: [NeutronOvsAgent, role_data, puppet_config, step_config]
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
# We need to mount /run for puppet_config step. This is because
|
||||
# puppet-vswitch runs the commands "ovs-vsctl list open_vswitch ."
|
||||
# when running vswitch::ovs::enable_hw_offload: true
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ parameters:
|
|||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
RoleName:
|
||||
default: ''
|
||||
description: Role name on which the service is applied
|
||||
|
|
@ -49,6 +51,18 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Neutron ML2 ansible Plugin role.
|
||||
|
|
@ -68,6 +82,6 @@ outputs:
|
|||
puppet_tags: neutron_plugin_ml2
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::plugins::ml2
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config: {}
|
||||
docker_config: {}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ parameters:
|
|||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
RoleName:
|
||||
default: ''
|
||||
description: Role name on which the service is applied
|
||||
|
|
@ -67,6 +69,18 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Neutron ML2 Cisco VTS Plugin role.
|
||||
|
|
@ -91,6 +105,6 @@ outputs:
|
|||
puppet_tags: neutron_plugin_ml2
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::plugins::ml2
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config: {}
|
||||
docker_config: {}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ parameters:
|
|||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
RoleName:
|
||||
default: ''
|
||||
description: Role name on which the service is applied
|
||||
|
|
@ -45,6 +47,18 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Neutron ML2 Plugin role.
|
||||
|
|
@ -62,7 +76,7 @@ outputs:
|
|||
puppet_tags: {get_param: NeutronPluginMl2PuppetTags}
|
||||
step_config:
|
||||
get_attr: [NeutronBase, role_data, step_config]
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config: {}
|
||||
docker_config: {}
|
||||
host_prep_tasks: []
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@ parameters:
|
|||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
MlnxSDNUsername:
|
||||
description: DEPRECATED, The username for the SDN server.
|
||||
type: string
|
||||
|
|
@ -80,6 +82,18 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the MLNX SDN ML2 Plugin.
|
||||
|
|
@ -103,6 +117,6 @@ outputs:
|
|||
puppet_tags: neutron_plugin_ml2
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::plugins::ml2
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config: {}
|
||||
docker_config: {}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ parameters:
|
|||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
RoleName:
|
||||
default: ''
|
||||
description: Role name on which the service is applied
|
||||
|
|
@ -78,6 +80,20 @@ parameters:
|
|||
be used to enable DHCP relay on router ports.
|
||||
type: string
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Neutron NSX Plugin role.
|
||||
|
|
@ -104,6 +120,6 @@ outputs:
|
|||
step_config:
|
||||
get_attr: |
|
||||
include tripleo::profile::base::neutron::plugins::nsx
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config: {}
|
||||
docker_config: {}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ parameters:
|
|||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
NeutronSfcDriver:
|
||||
default: 'dummy'
|
||||
description: Default driver for Service Function Chaining
|
||||
|
|
@ -39,6 +41,20 @@ parameters:
|
|||
description: Default driver for Flow Classifier
|
||||
type: string
|
||||
|
||||
resources:
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the SFC role.
|
||||
|
|
@ -53,6 +69,6 @@ outputs:
|
|||
puppet_tags: neutron_sfc_service_config
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::sfc
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config: {}
|
||||
docker_config: {}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerNeutronSriovImage:
|
||||
description: The container image to use for the Neutron SR-IOV agent
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNeutronConfigImage:
|
||||
description: The container image to use for the neutron config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
DockerSRIOVUlimit:
|
||||
default: ['nofile=16384']
|
||||
description: ulimit for SR-IOV Container
|
||||
|
|
@ -107,12 +111,16 @@ resources:
|
|||
neutron::agents::ml2::sriov::exclude_devices: NeutronExcludeDevices
|
||||
neutron::agents::ml2::sriov::extensions: NeutronSriovAgentExtensions
|
||||
neutron::agents::ml2::sriov::resource_provider_bandwidths: NeutronSriovResourceProviderBandwidths
|
||||
ContainerNeutronSriovImage: ContainerNeutronSriovImage
|
||||
ContainerNeutronConfigImage: ContainerNeutronConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
NeutronPhysicalDevMappings: {get_param: NeutronPhysicalDevMappings}
|
||||
NeutronExcludeDevices: {get_param: NeutronExcludeDevices}
|
||||
NeutronSriovAgentExtensions: {get_param: NeutronSriovAgentExtensions}
|
||||
NeutronSriovResourceProviderBandwidths: {get_param: NeutronSriovResourceProviderBandwidths}
|
||||
ContainerNeutronSriovImage: {get_param: ContainerNeutronSriovImage}
|
||||
ContainerNeutronConfigImage: {get_param: ContainerNeutronConfigImage}
|
||||
|
||||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
|
@ -147,7 +155,7 @@ outputs:
|
|||
puppet_tags: neutron_config,neutron_agent_sriov_numvfs,neutron_sriov_agent_config
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::sriov
|
||||
config_image: {get_param: ContainerNeutronConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNeutronConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/neutron_sriov_agent.json:
|
||||
command:
|
||||
|
|
@ -168,7 +176,7 @@ outputs:
|
|||
step_4:
|
||||
neutron_sriov_agent:
|
||||
start_order: 10
|
||||
image: {get_param: ContainerNeutronSriovImage}
|
||||
image: {get_attr: [RoleParametersValue, value, ContainerNeutronSriovImage]}
|
||||
net: host
|
||||
pid: host
|
||||
privileged: true
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerNovaApiImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNovaConfigImage:
|
||||
description: The container image to use for the nova config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
NovaApiLoggingSource:
|
||||
type: json
|
||||
default:
|
||||
|
|
@ -296,6 +300,19 @@ resources:
|
|||
RoleName: {get_param: RoleName}
|
||||
RoleParameters: {get_param: RoleParameters}
|
||||
|
||||
RoleParametersValue:
|
||||
type: OS::Heat::Value
|
||||
properties:
|
||||
type: json
|
||||
value:
|
||||
map_replace:
|
||||
- map_replace:
|
||||
- ContainerNovaApiImage: ContainerNovaApiImage
|
||||
ContainerNovaConfigImage: ContainerNovaConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
ContainerNovaApiImage: {get_param: ContainerNovaApiImage}
|
||||
ContainerNovaConfigImage: {get_param: ContainerNovaConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
|
|
@ -426,7 +443,7 @@ outputs:
|
|||
- - "['Nova_cell_v2'].each |String $val| { noop_resource($val) }"
|
||||
- include tripleo::profile::base::nova::api
|
||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||
config_image: {get_param: ContainerNovaConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNovaConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/nova_api.json:
|
||||
command: /usr/sbin/httpd -DFOREGROUND
|
||||
|
|
@ -552,7 +569,7 @@ outputs:
|
|||
step_3:
|
||||
nova_api_db_sync:
|
||||
start_order: 0 # Runs before nova-conductor dbsync
|
||||
image: &nova_api_image {get_param: ContainerNovaApiImage}
|
||||
image: &nova_api_image {get_attr: [RoleParametersValue, value, ContainerNovaApiImage]}
|
||||
net: host
|
||||
detach: false
|
||||
user: root
|
||||
|
|
|
|||
|
|
@ -7,9 +7,13 @@ parameters:
|
|||
ContainerNovaComputeImage:
|
||||
description: image
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
ContainerNovaLibvirtConfigImage:
|
||||
description: The container image to use for the nova_libvirt config_volume
|
||||
type: string
|
||||
tags:
|
||||
- role_specific
|
||||
DockerNovaComputeUlimit:
|
||||
default: ['nofile=131072', 'memlock=67108864']
|
||||
description: ulimit for Nova Compute Container
|
||||
|
|
@ -883,7 +887,7 @@ resources:
|
|||
NovaLogging:
|
||||
type: OS::TripleO::Services::Logging::NovaCommon
|
||||
properties:
|
||||
ContainerNovaImage: {get_param: ContainerNovaComputeImage}
|
||||
ContainerNovaImage: {get_attr: [RoleParametersValue, value, ContainerNovaComputeImage]}
|
||||
NovaServiceName: 'compute'
|
||||
|
||||
NovaBase:
|
||||
|
|
@ -960,6 +964,8 @@ resources:
|
|||
nova::compute::provider::custom_inventories: CustomProviderInventories
|
||||
nova::compute::rbd::libvirt_images_rbd_glance_copy_poll_interval: NovaGlanceRbdCopyPollInterval
|
||||
nova::compute::rbd::libvirt_images_rbd_glance_copy_timeout: NovaGlanceRbdCopyTimeout
|
||||
ContainerNovaComputeImage: ContainerNovaComputeImage
|
||||
ContainerNovaLibvirtConfigImage: ContainerNovaLibvirtConfigImage
|
||||
- values: {get_param: [RoleParameters]}
|
||||
- values:
|
||||
NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
|
||||
|
|
@ -1061,6 +1067,8 @@ resources:
|
|||
CustomProviderInventories: {get_param: CustomProviderInventories}
|
||||
NovaGlanceRbdCopyPollInterval: {get_param: NovaGlanceRbdCopyPollInterval}
|
||||
NovaGlanceRbdCopyTimeout: {get_param: NovaGlanceRbdCopyTimeout}
|
||||
ContainerNovaComputeImage: {get_param: ContainerNovaComputeImage}
|
||||
ContainerNovaLibvirtConfigImage: {get_param: ContainerNovaLibvirtConfigImage}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
|
|
@ -1208,7 +1216,7 @@ outputs:
|
|||
# We'll probably treat it like we do with Neutron plugins.
|
||||
# Until then, just include it in the default nova-compute role.
|
||||
include tripleo::profile::base::nova::compute::libvirt
|
||||
config_image: {get_param: ContainerNovaLibvirtConfigImage}
|
||||
config_image: {get_attr: [RoleParametersValue, value, ContainerNovaLibvirtConfigImage]}
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/nova_compute.json:
|
||||
command:
|
||||
|
|
@ -1294,7 +1302,7 @@ outputs:
|
|||
get_attr: [NovaLogging, docker_config, step_2]
|
||||
step_3:
|
||||
nova_statedir_owner:
|
||||
image: &nova_compute_image {get_param: ContainerNovaComputeImage}
|
||||
image: &nova_compute_image {get_attr: [RoleParametersValue, value, ContainerNovaComputeImage]}
|
||||
net: none
|
||||
user: root
|
||||
security_opt:
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue