openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix indirect reference to hieradata"

This commit is contained in:
Zuul 2022-08-04 23:30:27 +00:00 committed by Gerrit Code Review
parent 9468ae4f48 ce3796aa60
commit b36d30e898
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/etcd/etcd-container-puppet.yaml
View File

@ -217,7 +217,7 @@ outputs:
# etcdctl doesn't generate reliable error status, so use presence of the
# node's own name to determine whether this node is capable of managing
# etcd membership.
ETCD_NAME=$(hiera -c /etc/puppet/hiera.yaml etcd::etcd_name)
ETCD_NAME=$(hiera -c /etc/puppet/hiera.yaml fqdn_${ETCD_NETWORK})
if ! grep -q $ETCD_NAME /tmp/etcd-members; then
echo "This is a new node that is unable to manage etcd membership"
exit 0
@ -275,6 +275,7 @@ outputs:
- /etc/pki/tls/private/etcd.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/etcd.key:ro
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
ETCD_NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]}
deploy_steps_tasks:
list_concat:
- - name: Manage etcd cluster membership

2
deployment/nova/nova-az-config.yaml
View File

@ -61,7 +61,7 @@ outputs:
# Step0: Set the hieradata nova::host as a ansible fact so that we can
# use it later in the tasks in external_post_deploy_tasks
- name: Get nova::host value
shell: hiera -c /etc/puppet/hiera.yaml nova::host
shell: hiera -c /etc/puppet/hiera.yaml fqdn_canonical
register: nova_host_result
when: "step|int == 1"
- name: Set nova_host fact

16
deployment/ovn/ovn-dbs-container-puppet.yaml
View File

@ -222,11 +222,17 @@ outputs:
- ['ovn_north_db_server', '/bin/bash', '-c']
- - list_join:
- ' '
- - 'DBS_LISTEN_IP=`hiera ovn::northd::dbs_listen_ip -c /etc/puppet/hiera.yaml`; NB_DB_PORT=`hiera ovn::northbound::port -c /etc/puppet/hiera.yaml`; /usr/bin/bootstrap_host_exec ovn_dbs ovn-nbctl set-connection'
-
# TODO(tkajinam): Replace the hiera CLI
- 'DBS_LISTEN_IP=`hiera $OVN_DB_NETWORK -c /etc/puppet/hiera.yaml`;'
- '/usr/bin/bootstrap_host_exec ovn_dbs ovn-nbctl set-connection'
- if:
- {get_param: EnableInternalTLS}
- 'pssl:$NB_DB_PORT:$DBS_LISTEN_IP'
- 'ptcp:$NB_DB_PORT:$DBS_LISTEN_IP'
environment:
OVN_DB_NETWORK: {get_param: [ServiceNetMap, OvnDbsNetwork]}
NB_DB_PORT: {get_param: OVNNorthboundServerPort}
configure_ovn_south_db_server:
start_order: 1
action: exec
@ -236,11 +242,17 @@ outputs:
- ['ovn_south_db_server', '/bin/bash', '-c']
- - list_join:
- ' '
- - 'DBS_LISTEN_IP=`hiera ovn::northd::dbs_listen_ip -c /etc/puppet/hiera.yaml`; SB_DB_PORT=`hiera ovn::southbound::port -c /etc/puppet/hiera.yaml`; /usr/bin/bootstrap_host_exec ovn_dbs ovn-sbctl set-connection'
-
# TODO(tkajinam): Replace the hiera CLI
- 'DBS_LISTEN_IP=`hiera $OVN_DB_NETWORK -c /etc/puppet/hiera.yaml`;'
- '/usr/bin/bootstrap_host_exec ovn_dbs ovn-sbctl set-connection'
- if:
- {get_param: EnableInternalTLS}
- 'pssl:$SB_DB_PORT:$DBS_LISTEN_IP'
- 'ptcp:$SB_DB_PORT:$DBS_LISTEN_IP'
environment:
OVN_DB_NETWORK: {get_param: [ServiceNetMap, OvnDbsNetwork]}
SB_DB_PORT: {get_param: OVNSouthboundServerPort}
ovn_northd:
start_order: 2
image: {get_attr: [RoleParametersValue, value, ContainerOvnNorthdImage]}