Replacing the static pod definition for etcd ip.

Azure · May 31, 2018 · 69bcd35 · 69bcd35
1 parent da8646d
commit 69bcd35
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/parts/openshift/unstable/openshiftmasterscript.sh b/parts/openshift/unstable/openshiftmasterscript.sh
@@ -9,6 +9,7 @@ else
 	SERVICE_TYPE=origin
 fi
 VERSION="$(rpm -q $SERVICE_TYPE --queryformat %{VERSION})"
+IP_ADDRESS="{{ .MasterIP }}"
 
 if [ -f "/etc/sysconfig/atomic-openshift-node" ]; then
 	ANSIBLE_DEPLOY_TYPE="openshift-enterprise"
@@ -101,6 +102,10 @@ for loc in /root/.kube/config /etc/origin/node/bootstrap.kubeconfig /etc/origin/
   cp /etc/origin/master/admin.kubeconfig "$loc"
 done
 
+
+# Patch the etcd_ip address placed inside of the static pod definition from the node install
+sed -i "s/ETCD_IP_REPLACE/${IP_ADDRESS}/g" /etc/origin/node/disabled/etcd.yaml
+
 # Move each static pod into place so the kubelet will run it.
 # Pods: [apiserver, controller, etcd]
 mv /etc/origin/node/disabled/* /etc/origin/node/pods

diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -1909,11 +1909,13 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
 				ExternalMasterHostname string
 				RouterLBHostname       string
 				Location               string
+				MasterIP               string
 			}{
 				ConfigBundle:           base64.StdEncoding.EncodeToString(cs.Properties.OrchestratorProfile.OpenShiftConfig.ConfigBundles["master"]),
 				ExternalMasterHostname: fmt.Sprintf("%s.%s.cloudapp.azure.com", cs.Properties.MasterProfile.DNSPrefix, cs.Properties.AzProfile.Location),
 				RouterLBHostname:       fmt.Sprintf("%s-router.%s.cloudapp.azure.com", cs.Properties.MasterProfile.DNSPrefix, cs.Properties.AzProfile.Location),
 				Location:               cs.Properties.AzProfile.Location,
+				MasterIP:               cs.Properties.MasterProfile.FirstConsecutiveStaticIP,
 			})
 			return b.String(), err
 		},

diff --git a/pkg/openshift/certgen/unstable/templates/bindata.go b/pkg/openshift/certgen/unstable/templates/bindata.go
diff --git a/pkg/openshift/certgen/unstable/templates/master/tmp/ansible/azure-ocp-deploy.yml b/pkg/openshift/certgen/unstable/templates/master/tmp/ansible/azure-ocp-deploy.yml
@@ -2,7 +2,11 @@
   hosts: localmaster
   gather_facts: false
 
-  tasks:
+  # we need variables from openshift_facts to be in scope
+  roles:
+    - openshift_facts
+
+  post_tasks:
     - name: bring up the sdn
       import_role:
         name: openshift_sdn