From 4de6a78e26c1af60f6a1e043f3019e6a2cb62a09 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Sat, 20 Apr 2019 15:21:40 +0200
Subject: [PATCH] Fix CI for packet_centos7-flannel-addons (#4586)

---
 .gitlab-ci/gce.yml                            | 2 +-
 .gitlab-ci/packet.yml                         | 2 +-
 tests/files/packet_centos7-flannel-addons.yml | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/gce.yml b/.gitlab-ci/gce.yml
index da9ab4fbf..83a5b0a4e 100644
--- a/.gitlab-ci/gce.yml
+++ b/.gitlab-ci/gce.yml
@@ -51,7 +51,7 @@ gce_coreos-calico-aio:
 gce_centos7-flannel-addons:
   stage: deploy-gce
   <<: *gce
-  when: on_success
+  when: manual
   except: ['triggers']
   only: [/^pr-.*$/]
 
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 70103ddbd..cb1693cf0 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -26,7 +26,7 @@ packet_ubuntu18-flannel-aio:
 packet_centos7-flannel-addons:
   stage: deploy-part2
   <<: *packet
-  when: manual
+  when: on_success
   except: ['triggers']
   only: [/^pr-.*$/]
 
diff --git a/tests/files/packet_centos7-flannel-addons.yml b/tests/files/packet_centos7-flannel-addons.yml
index 1d85726a0..fd75df3da 100644
--- a/tests/files/packet_centos7-flannel-addons.yml
+++ b/tests/files/packet_centos7-flannel-addons.yml
@@ -4,6 +4,8 @@ cloud_image: centos-7
 mode: ha
 
 # Kubespray settings
+kubeadm_control_plane: true
+kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085
 kube_network_plugin: flannel
 helm_enabled: true
 kubernetes_audit: true
@@ -12,13 +14,12 @@ local_volume_provisioner_enabled: true
 etcd_deployment_type: host
 deploy_netchecker: true
 dns_min_replicas: 1
-cloud_provider: gce
 kube_encrypt_secret_data: true
 ingress_nginx_enabled: true
 cert_manager_enabled: true
 metrics_server_enabled: true
 kube_token_auth: true
 kube_basic_auth: true
-enable_nodelocaldns: true
+enable_nodelocaldns: false
 
 vm_memory: 6144Mi