Browse Source

Merge pull request #9737 from dmmcquay/update_cnx_conditional

fix error in cnx conditional regex
OpenShift Merge Robot 6 years ago
parent
commit
d486908f94
1 changed files with 1 additions and 1 deletions
  1. 1 1
      roles/calico_master/tasks/main.yml

+ 1 - 1
roles/calico_master/tasks/main.yml

@@ -36,7 +36,7 @@
 - name: Calico Master | Parse node version
   set_fact:
     node_version: "{{ calico_node_image | regex_replace('^.*node:v?(.*)$', '\\1') }}"
-    cnx: "{{ calico_node_image | regex_replace('[^-]*', '\\0') }}"
+    cnx: "{{ calico_node_image | regex_replace('^.*/(.*)-node:.*$', '\\1') }}"
 
 - name: Calico Master | Write Calico v2
   template: