Simplify rest of the service templates
Change-Id: Id51681b072945c161ac029d89ef72409051b8cc4
This commit is contained in:
parent
4c9b1ba81a
commit
c761ebeca5
|
@ -4,7 +4,6 @@ description: >
|
|||
Contains a static list of common things necessary for containers
|
||||
|
||||
parameters:
|
||||
|
||||
# Required parameters
|
||||
EndpointMap:
|
||||
default: {}
|
||||
|
@ -29,8 +28,6 @@ parameters:
|
|||
default: {}
|
||||
description: Parameters specific to the role
|
||||
type: json
|
||||
|
||||
|
||||
EnableInternalTLS:
|
||||
type: boolean
|
||||
default: false
|
||||
|
@ -43,13 +40,11 @@ parameters:
|
|||
default: 5672
|
||||
description: The network port for messaging backend
|
||||
type: number
|
||||
|
||||
PcmkConfigRestartTimeout:
|
||||
default: 600
|
||||
description: Time in seconds to wait for a pacemaker resource to restart when
|
||||
a config change is detected and the resource is being restarted
|
||||
type: number
|
||||
|
||||
ContainerCli:
|
||||
type: string
|
||||
default: 'podman'
|
||||
|
@ -57,11 +52,6 @@ parameters:
|
|||
constraints:
|
||||
- allowed_values: ['docker', 'podman']
|
||||
|
||||
conditions:
|
||||
|
||||
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
||||
docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
|
||||
|
||||
outputs:
|
||||
container_config_scripts:
|
||||
description: Shared container config scripts
|
||||
|
@ -143,13 +133,12 @@ outputs:
|
|||
# Syslog socket
|
||||
- /dev/log:/dev/log
|
||||
- if:
|
||||
- internal_tls_enabled
|
||||
- {get_param: EnableInternalTLS}
|
||||
- - list_join:
|
||||
- ':'
|
||||
- - {get_param: InternalTLSCAFile}
|
||||
- {get_param: InternalTLSCAFile}
|
||||
- 'ro'
|
||||
- null
|
||||
|
||||
volumes:
|
||||
description: Common volumes for the containers.
|
||||
|
@ -168,10 +157,6 @@ outputs:
|
|||
- /dev/shm:/dev/shm:rw
|
||||
# required for bootstrap_host_exec, facter
|
||||
- /etc/puppet:/etc/puppet:ro
|
||||
- if:
|
||||
- docker_enabled
|
||||
- - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
|
||||
- null
|
||||
|
||||
container_puppet_apply_volumes:
|
||||
description: Common volumes needed to run the container_puppet_apply.sh from container_config_scripts
|
||||
|
|
|
@ -29,7 +29,6 @@ parameters:
|
|||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
|
||||
UndercloudIpaOtp:
|
||||
default: ''
|
||||
description: The OTP to use to enroll to FreeIPA
|
||||
|
|
|
@ -49,12 +49,6 @@ resources:
|
|||
- values:
|
||||
ExtraFirewallRules: {get_param: ExtraFirewallRules}
|
||||
|
||||
conditions:
|
||||
no_ctlplane:
|
||||
equals:
|
||||
- get_params: [ServiceData, net_cidr_map, ctlplane]
|
||||
- Null
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the TripleO firewall settings
|
||||
|
@ -75,19 +69,6 @@ outputs:
|
|||
proto: 'tcp'
|
||||
dport: 22
|
||||
- {get_attr: [RoleParametersValue, value, extra_firewall_rules]}
|
||||
host_prep_tasks:
|
||||
- if:
|
||||
- no_ctlplane
|
||||
- name: Failure - ctlplane subnet is unset
|
||||
fail:
|
||||
msg: |
|
||||
No CIDRs found in the ctlplane network tags.
|
||||
Please refer to the documentation in order to
|
||||
set the correct network tags in DeployedServerPortMap.
|
||||
- name: Notice - ctlplane subnet is set
|
||||
debug:
|
||||
msg: |
|
||||
CIDRs found in the ctlplane network tags.
|
||||
update_tasks:
|
||||
- name: Cleanup tripleo-iptables services
|
||||
when:
|
||||
|
|
|
@ -36,7 +36,6 @@ parameters:
|
|||
MonitoringSubscriptionUnbound:
|
||||
default: 'overcloud-unbound'
|
||||
type: string
|
||||
|
||||
# Unbound specific parameters
|
||||
UnboundAllowedCIDRs:
|
||||
default: []
|
||||
|
@ -54,7 +53,6 @@ parameters:
|
|||
type: boolean
|
||||
|
||||
resources:
|
||||
|
||||
ContainersCommon:
|
||||
type: ../containers-common.yaml
|
||||
|
||||
|
@ -102,8 +100,7 @@ outputs:
|
|||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /run/:/run/
|
||||
- - /run/:/run/
|
||||
- /var/lib/kolla/config_files/unbound.json:/var/lib/kolla/config_files/config.json:ro
|
||||
- /var/log/containers/unbound:/var/log/unbound:z
|
||||
- /var/lib/config-data/ansible-generated/unbound:/var/lib/kolla/config_files/src:ro
|
||||
|
|
Loading…
Reference in New Issue