Merge "Move set of database_connection to OctaviaBase"
This commit is contained in:
commit
08fdd01b68
|
@ -51,6 +51,9 @@ resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ./containers-common.yaml
|
type: ./containers-common.yaml
|
||||||
|
|
||||||
|
MySQLClient:
|
||||||
|
type: ../../puppet/services/database/mysql-client.yaml
|
||||||
|
|
||||||
OctaviaHealthManagerPuppetBase:
|
OctaviaHealthManagerPuppetBase:
|
||||||
type: ../../puppet/services/octavia-health-manager.yaml
|
type: ../../puppet/services/octavia-health-manager.yaml
|
||||||
properties:
|
properties:
|
||||||
|
@ -80,7 +83,10 @@ outputs:
|
||||||
config_volume: octavia
|
config_volume: octavia
|
||||||
puppet_tags: octavia_config
|
puppet_tags: octavia_config
|
||||||
step_config:
|
step_config:
|
||||||
get_attr: [OctaviaHealthManagerPuppetBase, role_data, step_config]
|
list_join:
|
||||||
|
- "\n"
|
||||||
|
- - {get_attr: [OctaviaHealthManagerPuppetBase, role_data, step_config]}
|
||||||
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||||
config_image: {get_param: DockerOctaviaConfigImage}
|
config_image: {get_param: DockerOctaviaConfigImage}
|
||||||
kolla_config:
|
kolla_config:
|
||||||
/var/lib/kolla/config_files/octavia_health_manager.json:
|
/var/lib/kolla/config_files/octavia_health_manager.json:
|
||||||
|
|
|
@ -47,6 +47,9 @@ resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ./containers-common.yaml
|
type: ./containers-common.yaml
|
||||||
|
|
||||||
|
MySQLClient:
|
||||||
|
type: ../../puppet/services/database/mysql-client.yaml
|
||||||
|
|
||||||
OctaviaHousekeepingPuppetBase:
|
OctaviaHousekeepingPuppetBase:
|
||||||
type: ../../puppet/services/octavia-housekeeping.yaml
|
type: ../../puppet/services/octavia-housekeeping.yaml
|
||||||
properties:
|
properties:
|
||||||
|
@ -76,7 +79,10 @@ outputs:
|
||||||
config_volume: octavia
|
config_volume: octavia
|
||||||
puppet_tags: octavia_config
|
puppet_tags: octavia_config
|
||||||
step_config:
|
step_config:
|
||||||
get_attr: [OctaviaHousekeepingPuppetBase, role_data, step_config]
|
list_join:
|
||||||
|
- "\n"
|
||||||
|
- - {get_attr: [OctaviaHousekeepingPuppetBase, role_data, step_config]}
|
||||||
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||||
config_image: {get_param: DockerOctaviaConfigImage}
|
config_image: {get_param: DockerOctaviaConfigImage}
|
||||||
kolla_config:
|
kolla_config:
|
||||||
/var/lib/kolla/config_files/octavia_housekeeping.json:
|
/var/lib/kolla/config_files/octavia_housekeeping.json:
|
||||||
|
|
|
@ -51,6 +51,9 @@ resources:
|
||||||
ContainersCommon:
|
ContainersCommon:
|
||||||
type: ./containers-common.yaml
|
type: ./containers-common.yaml
|
||||||
|
|
||||||
|
MySQLClient:
|
||||||
|
type: ../../puppet/services/database/mysql-client.yaml
|
||||||
|
|
||||||
OctaviaWorkerPuppetBase:
|
OctaviaWorkerPuppetBase:
|
||||||
type: ../../puppet/services/octavia-worker.yaml
|
type: ../../puppet/services/octavia-worker.yaml
|
||||||
properties:
|
properties:
|
||||||
|
@ -84,6 +87,7 @@ outputs:
|
||||||
- "\n"
|
- "\n"
|
||||||
- - "['nova_flavor'].each |String $val| { noop_resource($val) }"
|
- - "['nova_flavor'].each |String $val| { noop_resource($val) }"
|
||||||
- {get_attr: [OctaviaWorkerPuppetBase, role_data, step_config]}
|
- {get_attr: [OctaviaWorkerPuppetBase, role_data, step_config]}
|
||||||
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
||||||
config_image: {get_param: DockerOctaviaConfigImage}
|
config_image: {get_param: DockerOctaviaConfigImage}
|
||||||
kolla_config:
|
kolla_config:
|
||||||
/var/lib/kolla/config_files/octavia_worker.json:
|
/var/lib/kolla/config_files/octavia_worker.json:
|
||||||
|
|
|
@ -103,16 +103,6 @@ outputs:
|
||||||
- octavia::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
- octavia::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||||
octavia::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
octavia::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
|
||||||
octavia::policy::policies: {get_param: OctaviaApiPolicies}
|
octavia::policy::policies: {get_param: OctaviaApiPolicies}
|
||||||
octavia::db::database_connection:
|
|
||||||
make_url:
|
|
||||||
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
|
|
||||||
username: {get_param: OctaviaUserName}
|
|
||||||
password: {get_param: OctaviaPassword}
|
|
||||||
host: {get_param: [EndpointMap, MysqlInternal, host]}
|
|
||||||
path: /octavia
|
|
||||||
query:
|
|
||||||
read_default_file: /etc/my.cnf.d/tripleo.cnf
|
|
||||||
read_default_group: tripleo
|
|
||||||
octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||||
octavia::keystone::authtoken::project_name: {get_param: OctaviaProjectName}
|
octavia::keystone::authtoken::project_name: {get_param: OctaviaProjectName}
|
||||||
octavia::keystone::authtoken::password: {get_param: OctaviaPassword}
|
octavia::keystone::authtoken::password: {get_param: OctaviaPassword}
|
||||||
|
|
|
@ -126,6 +126,16 @@ outputs:
|
||||||
- {get_param: OctaviaDebug }
|
- {get_param: OctaviaDebug }
|
||||||
octavia::purge_config: {get_param: EnableConfigPurge}
|
octavia::purge_config: {get_param: EnableConfigPurge}
|
||||||
octavia::notification_driver: {get_param: NotificationDriver}
|
octavia::notification_driver: {get_param: NotificationDriver}
|
||||||
|
octavia::db::database_connection:
|
||||||
|
make_url:
|
||||||
|
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
|
||||||
|
username: {get_param: OctaviaUserName}
|
||||||
|
password: {get_param: OctaviaPassword}
|
||||||
|
host: {get_param: [EndpointMap, MysqlInternal, host]}
|
||||||
|
path: /octavia
|
||||||
|
query:
|
||||||
|
read_default_file: /etc/my.cnf.d/tripleo.cnf
|
||||||
|
read_default_group: tripleo
|
||||||
# TODO(ansmith): remove once p-t-o switches to oslo params
|
# TODO(ansmith): remove once p-t-o switches to oslo params
|
||||||
octavia::rabbit_use_ssl: {get_param: RpcUseSSL}
|
octavia::rabbit_use_ssl: {get_param: RpcUseSSL}
|
||||||
octavia::rabbit_userid: {get_param: RpcUserName}
|
octavia::rabbit_userid: {get_param: RpcUserName}
|
||||||
|
|
Loading…
Reference in New Issue