[PATCH configure] BZ 795935 - Remove passwords from /etc/imagefactory/.json files

https://bugzilla.redhat.com/show_bug.cgi?id=795935 Removed passwords for vsphere and rhevm. Removed vsphere username and password from aeolus-configure because they are not used elsewhere. --- conf/vsphere_configure | 2 -- .../aeolus/manifests/profiles/vsphere/instance.pp | 2 -- recipes/aeolus/templates/rhevm.json | 1 - recipes/aeolus/templates/vsphere.json | 2 -- 4 files changed, 0 insertions(+), 7 deletions(-) diff --git a/conf/vsphere_configure b/conf/vsphere_configure index ca5bffe..b724a4e 100644 --- a/conf/vsphere_configure +++ b/conf/vsphere_configure @@ -14,7 +14,5 @@ classes: # Uncomment and provide values to match your vSphere environment. # Values below are examples. # deltacloud_provider: vsphere.server.com - # username: username - # password: password # datastore: datastore # network_name: network_name diff --git a/recipes/aeolus/manifests/profiles/vsphere/instance.pp b/recipes/aeolus/manifests/profiles/vsphere/instance.pp index 55ac95f..1210fd4 100644 --- a/recipes/aeolus/manifests/profiles/vsphere/instance.pp +++ b/recipes/aeolus/manifests/profiles/vsphere/instance.pp @@ -13,8 +13,6 @@ # limitations under the License. define aeolus::profiles::vsphere::instance ($deltacloud_provider, - $username, - $password, $datastore, $network_name) { diff --git a/recipes/aeolus/templates/rhevm.json b/recipes/aeolus/templates/rhevm.json index fe7bbb6..21eae81 100644 --- a/recipes/aeolus/templates/rhevm.json +++ b/recipes/aeolus/templates/rhevm.json @@ -10,7 +10,6 @@ "nfs-path": "<%= params['nfs_export'] %>", "nfs-host": "<%= params['nfs_server'] %>", "api-url": "<%= params['deltacloud_api'] %>", - "password": "<%= params['deltacloud_password'] %>", "cluster": "_any_", "timeout": <%= params['push_timeout'] %> }<%= remaining_instances.zero? ? nil : ',' %> diff --git a/recipes/aeolus/templates/vsphere.json b/recipes/aeolus/templates/vsphere.json index af8fecc..4109978 100644 --- a/recipes/aeolus/templates/vsphere.json +++ b/recipes/aeolus/templates/vsphere.json @@ -6,8 +6,6 @@ "vsphere-<%= name %>": { "api-url": "https://<%= params['deltacloud_provider'] %>/sdk", - "username": "<%= params['username'] %>", - "password": "<%= params['password'] %>", "datastore": "<%= params['datastore'] %>", "network_name": "<%= params['network_name'] %>" }<%= remaining_instances.zero? ? nil : ',' %> -- 1.7.7.6