Skip to content
This repository has been archived by the owner on Feb 5, 2020. It is now read-only.

bootkube: remove redundant content_hash variable #575

Merged
merged 1 commit into from
May 8, 2017

Conversation

s-urbaniak
Copy link
Contributor

Just recognized while testing bare metal, that module.bootkube.content_hash is redundant with module.bootkube.id.

This fixes it.

/cc @alexsomesan

@s-urbaniak
Copy link
Contributor Author

ok to test

@coreosbot
Copy link

Can one of the admins verify this patch?

@s-urbaniak s-urbaniak force-pushed the fix-id branch 2 times, most recently from 0cca0c6 to 3d7bca9 Compare May 8, 2017 13:08
@s-urbaniak
Copy link
Contributor Author

ok to test

@alexsomesan
Copy link
Contributor

LGTM

@s-urbaniak s-urbaniak merged commit f860913 into coreos:master May 8, 2017
alekssaul added a commit to alekssaul/tectonic-installer that referenced this pull request May 18, 2017
alekssaul added a commit to alekssaul/tectonic-installer that referenced this pull request May 18, 2017
@alekssaul alekssaul mentioned this pull request May 18, 2017
s-urbaniak pushed a commit that referenced this pull request Jun 1, 2017
* Initial VMware Support

* Always invoke terraform get to ensure we have the necessary modules (#591)

* Makefile: add vmware docs-examples

* Run make docs for VMware updates

To address; #639 (comment)

* Run terraform fmt on VMware content

run `terraform fmt ./platforms/vmware/` , `terraform fmt ./modules/vmware/etcd` , `terraform fmt ./platforms/vmware/nodes` to address #639 (comment)

* Variables cleanup and change ssh variable

- cleanup variables.tf and run `make examples` to address; #639 (comment)
- run `make docs` 
- update `tectonic_ssh_authorized_key` to `tectonic_vmware_ssh_authorized_key ` to address #639 (comment)

* Fix Makefile conflict with vmware branch

* vmware: remove redundant bootkube content_hash variable

Related to #575

* vmware: remove username secrets from variables.tf

Removes VMware Username and Password variables from variables.tf.

User will be prompted to enter credentials at terraform execution time, such as. 
```
provider.vsphere.password
  The user password for vSphere API operations.

  Enter a value: 

provider.vsphere.user
  The user name for vSphere API operations.

  Enter a value: 
```

* VMware: fix Master CPU/memory vars issue

Master Node provisioning was utilizing worker CPU and memory variables.

* vmware examples - re-run make docs examples

* vmware: compute service k8s IPs

Add changes in #767 for VMware

* vmware: Replace all occurences of path.cwd

Applies d3e0a6a into vmware platform

* vmware: Bump bootkube v0.4.4 & hyperkube v1.6.4_coreos.0 

Applies requirements for 5941fda on VMware Platform

* vmware: run terraform fmt
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants