openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "moving docker registry config to environment"

This commit is contained in:
Jenkins 2017-08-22 20:04:09 +00:00 committed by Gerrit Code Review
parent 281ecbf161 54f7a32e4b
commit 80503ff56f
7 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/general_config/featureset010.yml
View File

@ -2,8 +2,6 @@ deploy_composable_scenario: true
composable_scenario: multinode-containers.yaml
composable_services: false
# Undercloud registry mirror
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
network_isolation: false
enable_pacemaker: false
overcloud_ipv6: false

2
config/general_config/featureset016.yml
View File

@ -9,8 +9,6 @@ overcloud_ipv6: false
enable_opstools_repo: true
containerized_overcloud: true
# Undercloud registry mirror
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
undercloud_generate_service_certificate: false
ssl_overcloud: false

2
config/general_config/featureset017.yml
View File

@ -7,8 +7,6 @@ enable_pacemaker: false
overcloud_ipv6: false
containerized_overcloud: true
# Undercloud registry mirror
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
undercloud_generate_service_certificate: false
ssl_overcloud: false

2
config/general_config/featureset018.yml
View File

@ -7,8 +7,6 @@ enable_pacemaker: false
overcloud_ipv6: false
containerized_overcloud: true
# Undercloud registry mirror
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
undercloud_generate_service_certificate: false
ssl_overcloud: false

2
config/general_config/featureset019.yml
View File

@ -7,8 +7,6 @@ enable_pacemaker: false
overcloud_ipv6: false
containerized_overcloud: true
# Undercloud registry mirror
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
undercloud_generate_service_certificate: false
ssl_overcloud: false

2
config/general_config/featureset022.yml
View File

@ -3,8 +3,6 @@ containerized_overcloud: true
# Workaround for limited disk space on undercloud
# https://bugs.launchpad.net/tripleo/+bug/1694709
delete_docker_cache: true
# Undercloud registry mirror
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
# TripleO settings
ssl_overcloud: false
undercloud_generate_service_certificate: true

2
config/general_config/featureset026.yml
View File

@ -5,8 +5,6 @@ network_isolation: false
enable_pacemaker: false
overcloud_ipv6: false
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
# configured public-vip and admin-vip.
undercloud_generate_service_certificate: false