openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Revert "Fixes for deploying nova-less undercloud""

Browse Source
This commit is contained in:
Zuul 2019-08-30 23:00:12 +00:00 committed by Gerrit Code Review
commit b09f1fb15d
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment/placement/placement-api-container-puppet.yaml
View File

@ -209,6 +209,7 @@ 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
@ -228,9 +229,8 @@ outputs:
- '=' - '='
- - 'NOVA_API_PASS' - - 'NOVA_API_PASS'
- {get_param: NovaPassword} - {get_param: NovaPassword}
# NOTE(lyarwood): We can swallow return codes of 0, 3, 4, 5 as they # NOTE(lyarwood): We can swallow return codes of 0, 3 and 4 as they
# suggest this is a fresh deployment with no data to extract # suggest this is a fresh deployment with no data to extract. The
# (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
@ -239,8 +239,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
exit_codes: [0, 3, 4, 5] 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 -'"
placement_api_db_sync: placement_api_db_sync:
start_order: 1 start_order: 1
image: *placement_api_image image: *placement_api_image

9
environments/undercloud-disable-nova.yaml
View File

@ -1,13 +1,10 @@
# This heat environment can be used to disable the nova/glance services used on # This heat environment can be used to disable the nova services used on the
# the undercloud. It is used for underclouds which only use deployed-server # 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