From 54f7a32e4b99d042d0e273764b813bd60fd949f9 Mon Sep 17 00:00:00 2001 From: Wes Hayutin Date: Thu, 17 Aug 2017 13:11:42 -0400 Subject: [PATCH] moving docker registry config to environment Adding the docker registry config to the featureset config breaks the fs config when executed in other environments. Depends-On: I9b3ac36033c0b9e994a13188f750e9e1d484bd2d Change-Id: I5b8a99b4ada9868169a4631aa591a911357f9bcb --- config/general_config/featureset010.yml | 2 -- config/general_config/featureset016.yml | 2 -- config/general_config/featureset017.yml | 2 -- config/general_config/featureset018.yml | 2 -- config/general_config/featureset019.yml | 2 -- config/general_config/featureset022.yml | 2 -- config/general_config/featureset026.yml | 2 -- 7 files changed, 14 deletions(-) diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml index f8c8ca997..1d69ab828 100644 --- a/config/general_config/featureset010.yml +++ b/config/general_config/featureset010.yml @@ -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 diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml index 40448b668..0c011a671 100644 --- a/config/general_config/featureset016.yml +++ b/config/general_config/featureset016.yml @@ -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 diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml index dd0939aae..39294f356 100644 --- a/config/general_config/featureset017.yml +++ b/config/general_config/featureset017.yml @@ -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 diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml index 2e806bd5a..9c55a9f68 100644 --- a/config/general_config/featureset018.yml +++ b/config/general_config/featureset018.yml @@ -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 diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml index df6976ecf..28608f38d 100644 --- a/config/general_config/featureset019.yml +++ b/config/general_config/featureset019.yml @@ -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 diff --git a/config/general_config/featureset022.yml b/config/general_config/featureset022.yml index acd4ebca2..b296b9c20 100644 --- a/config/general_config/featureset022.yml +++ b/config/general_config/featureset022.yml @@ -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 diff --git a/config/general_config/featureset026.yml b/config/general_config/featureset026.yml index 93908c388..93474015a 100644 --- a/config/general_config/featureset026.yml +++ b/config/general_config/featureset026.yml @@ -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