Merge "Revert "Revert "Fixes for deploying nova-less undercloud"""
This commit is contained in:
commit
bc9694e9ed
@ -207,7 +207,6 @@ outputs:
|
|||||||
-
|
-
|
||||||
- /var/lib/config-data/placement/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
|
- /var/lib/config-data/placement/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
|
||||||
- /var/lib/config-data/placement/etc/placement/:/etc/placement/:ro
|
- /var/lib/config-data/placement/etc/placement/:/etc/placement/:ro
|
||||||
- /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
|
|
||||||
environment:
|
environment:
|
||||||
- PLACEMENT_USER=placement
|
- PLACEMENT_USER=placement
|
||||||
- NOVA_API_USER=nova_api
|
- NOVA_API_USER=nova_api
|
||||||
@ -227,8 +226,9 @@ outputs:
|
|||||||
- '='
|
- '='
|
||||||
- - 'NOVA_API_PASS'
|
- - 'NOVA_API_PASS'
|
||||||
- {get_param: NovaPassword}
|
- {get_param: NovaPassword}
|
||||||
# NOTE(lyarwood): We can swallow return codes of 0, 3 and 4 as they
|
# NOTE(lyarwood): We can swallow return codes of 0, 3, 4, 5 as they
|
||||||
# suggest this is a fresh deployment with no data to extract. The
|
# suggest this is a fresh deployment with no data to extract
|
||||||
|
# (or that placemant is being deployed without nova). The
|
||||||
# current list of return codes provided by the migrate script is:
|
# current list of return codes provided by the migrate script is:
|
||||||
# 0: Success
|
# 0: Success
|
||||||
# 1: Usage error
|
# 1: Usage error
|
||||||
@ -237,7 +237,7 @@ outputs:
|
|||||||
# 4: No data to migrate from nova (new deployment)
|
# 4: No data to migrate from nova (new deployment)
|
||||||
# 5: Unable to connect to one or both databases
|
# 5: Unable to connect to one or both databases
|
||||||
# 6: Unable to execute placement's CLI commands
|
# 6: Unable to execute placement's CLI commands
|
||||||
command: "/usr/bin/bootstrap_host_exec placement su placement -s /bin/bash -c 'cd /tmp && /usr/share/placement/mysql-migrate-db.sh --migrate -; ret=$?; if [ $ret -ne 0 ] && [ $ret -ne 3 ] && [ $ret -ne 4 ]; then exit $ret; else exit 0; fi'"
|
command: "/usr/bin/bootstrap_host_exec placement su placement -s /bin/bash -c 'cd /tmp && /usr/share/placement/mysql-migrate-db.sh --migrate -; ret=$?; if [ $ret -ne 0 ] && [ $ret -ne 3 ] && [ $ret -ne 4 ] && [ $ret -ne 5 ]; then exit $ret; else exit 0; fi'"
|
||||||
placement_api_db_sync:
|
placement_api_db_sync:
|
||||||
start_order: 1
|
start_order: 1
|
||||||
image: *placement_api_image
|
image: *placement_api_image
|
||||||
|
@ -1,10 +1,13 @@
|
|||||||
# This heat environment can be used to disable the nova services used on the
|
# This heat environment can be used to disable the nova/glance services used on
|
||||||
# undercloud. It is used for underclouds which only use deployed-server
|
# the undercloud. It is used for underclouds which only use deployed-server
|
||||||
# (optionally using ironic provisioned nodes).
|
# (optionally using ironic provisioned nodes).
|
||||||
|
|
||||||
|
parameter_defaults:
|
||||||
|
MistralExecutorVolumes: []
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Services::NovaApi: OS::Heat::None
|
OS::TripleO::Services::NovaApi: OS::Heat::None
|
||||||
OS::TripleO::Services::NovaConductor: OS::Heat::None
|
OS::TripleO::Services::NovaConductor: OS::Heat::None
|
||||||
OS::TripleO::Services::NovaIronic: OS::Heat::None
|
OS::TripleO::Services::NovaIronic: OS::Heat::None
|
||||||
OS::TripleO::Services::NovaMetadata: OS::Heat::None
|
OS::TripleO::Services::NovaMetadata: OS::Heat::None
|
||||||
OS::TripleO::Services::NovaScheduler: OS::Heat::None
|
OS::TripleO::Services::NovaScheduler: OS::Heat::None
|
||||||
|
OS::TripleO::Services::GlanceApi: OS::Heat::None
|
Loading…
Reference in New Issue
Block a user