Merge "moving docker registry config to environment"
This commit is contained in:
commit
80503ff56f
|
@ -2,8 +2,6 @@ deploy_composable_scenario: true
|
||||||
composable_scenario: multinode-containers.yaml
|
composable_scenario: multinode-containers.yaml
|
||||||
composable_services: false
|
composable_services: false
|
||||||
|
|
||||||
# Undercloud registry mirror
|
|
||||||
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
|
|
||||||
network_isolation: false
|
network_isolation: false
|
||||||
enable_pacemaker: false
|
enable_pacemaker: false
|
||||||
overcloud_ipv6: false
|
overcloud_ipv6: false
|
||||||
|
|
|
@ -9,8 +9,6 @@ overcloud_ipv6: false
|
||||||
enable_opstools_repo: true
|
enable_opstools_repo: true
|
||||||
|
|
||||||
containerized_overcloud: true
|
containerized_overcloud: true
|
||||||
# Undercloud registry mirror
|
|
||||||
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
|
|
||||||
undercloud_generate_service_certificate: false
|
undercloud_generate_service_certificate: false
|
||||||
|
|
||||||
ssl_overcloud: false
|
ssl_overcloud: false
|
||||||
|
|
|
@ -7,8 +7,6 @@ enable_pacemaker: false
|
||||||
overcloud_ipv6: false
|
overcloud_ipv6: false
|
||||||
|
|
||||||
containerized_overcloud: true
|
containerized_overcloud: true
|
||||||
# Undercloud registry mirror
|
|
||||||
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
|
|
||||||
undercloud_generate_service_certificate: false
|
undercloud_generate_service_certificate: false
|
||||||
|
|
||||||
ssl_overcloud: false
|
ssl_overcloud: false
|
||||||
|
|
|
@ -7,8 +7,6 @@ enable_pacemaker: false
|
||||||
overcloud_ipv6: false
|
overcloud_ipv6: false
|
||||||
|
|
||||||
containerized_overcloud: true
|
containerized_overcloud: true
|
||||||
# Undercloud registry mirror
|
|
||||||
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
|
|
||||||
undercloud_generate_service_certificate: false
|
undercloud_generate_service_certificate: false
|
||||||
|
|
||||||
ssl_overcloud: false
|
ssl_overcloud: false
|
||||||
|
|
|
@ -7,8 +7,6 @@ enable_pacemaker: false
|
||||||
overcloud_ipv6: false
|
overcloud_ipv6: false
|
||||||
|
|
||||||
containerized_overcloud: true
|
containerized_overcloud: true
|
||||||
# Undercloud registry mirror
|
|
||||||
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
|
|
||||||
undercloud_generate_service_certificate: false
|
undercloud_generate_service_certificate: false
|
||||||
|
|
||||||
ssl_overcloud: false
|
ssl_overcloud: false
|
||||||
|
|
|
@ -3,8 +3,6 @@ containerized_overcloud: true
|
||||||
# Workaround for limited disk space on undercloud
|
# Workaround for limited disk space on undercloud
|
||||||
# https://bugs.launchpad.net/tripleo/+bug/1694709
|
# https://bugs.launchpad.net/tripleo/+bug/1694709
|
||||||
delete_docker_cache: true
|
delete_docker_cache: true
|
||||||
# Undercloud registry mirror
|
|
||||||
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
|
|
||||||
# TripleO settings
|
# TripleO settings
|
||||||
ssl_overcloud: false
|
ssl_overcloud: false
|
||||||
undercloud_generate_service_certificate: true
|
undercloud_generate_service_certificate: true
|
||||||
|
|
|
@ -5,8 +5,6 @@ network_isolation: false
|
||||||
enable_pacemaker: false
|
enable_pacemaker: false
|
||||||
overcloud_ipv6: false
|
overcloud_ipv6: false
|
||||||
containerized_overcloud: true
|
containerized_overcloud: true
|
||||||
# Undercloud registry mirror
|
|
||||||
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
|
|
||||||
# This enables TLS for the undercloud which will also make haproxy bind to the
|
# This enables TLS for the undercloud which will also make haproxy bind to the
|
||||||
# configured public-vip and admin-vip.
|
# configured public-vip and admin-vip.
|
||||||
undercloud_generate_service_certificate: false
|
undercloud_generate_service_certificate: false
|
||||||
|
|
Loading…
Reference in New Issue