From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Thu, 25 Oct 2018 10:17:08 +0000 (+0200)
Subject: Adding some defaults for ini-Files
X-Git-Tag: 0.3.2^2~21
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=48aef348f78259612326c679428901c775849781;p=pixelpark%2Fcreate-vmware-tpl.git

Adding some defaults for ini-Files
---

diff --git a/etc/create-vmware-template-cluster1.ini.default b/etc/create-vmware-template-cluster1.ini.default
new file mode 100644
index 0000000..f54c8cc
--- /dev/null
+++ b/etc/create-vmware-template-cluster1.ini.default
@@ -0,0 +1,44 @@
+[vSphere]
+
+;host = vcs01.ppbrln.internal
+
+;port = 443
+
+;user = root
+
+;password = 
+
+;dc = vmcc
+
+cluster = vmcc-l105-01
+
+;folder = templates
+
+;excluded_datastores = vmcb-e2800-sata-02-01
+
+;max_nr_templates_stay = 4
+
+[Template]
+
+vm = template.pixelpark.com
+
+;name = oracle-linux-7-template
+
+;vmware_cfg_version = vmx-13
+
+;os_version = oracleLinux7_64Guest
+
+;data_size_gb = 32
+
+;num_cpus = 2
+
+;ram_mb = 4096
+
+;network = 192.168.88.0_23
+
+mac_address = 00:16:3e:54:ab:2b
+
+;max_wait_for_finish_install = 3600
+
+
+; vim: filetype=dosini
diff --git a/etc/create-vmware-template-cluster2.ini.default b/etc/create-vmware-template-cluster2.ini.default
new file mode 100644
index 0000000..ceaaca0
--- /dev/null
+++ b/etc/create-vmware-template-cluster2.ini.default
@@ -0,0 +1,41 @@
+[vSphere]
+
+;host = vcs01.ppbrln.internal
+
+;port = 443
+
+;user = root
+
+;password = 
+
+;dc = vmcc
+
+cluster = vmcc-l105-02
+
+;folder = templates
+
+;excluded_datastores = vmcb-e2800-sata-02-01
+
+;max_nr_templates_stay = 4
+
+[Template]
+
+vm = template2.pixelpark.com
+
+;name = oracle-linux-7-template
+
+
+;data_size_gb = 32
+
+;num_cpus = 2
+
+;ram_mb = 4096
+
+;network = 192.168.88.0_23
+
+mac_address = 00:16:3e:55:ab:2c
+
+;max_wait_for_finish_install = 3600
+
+
+; vim: filetype=dosini
diff --git a/etc/create-vmware-template-test-cluster1.ini.default b/etc/create-vmware-template-test-cluster1.ini.default
new file mode 100644
index 0000000..da5796f
--- /dev/null
+++ b/etc/create-vmware-template-test-cluster1.ini.default
@@ -0,0 +1,42 @@
+[vSphere]
+
+host = test-vcsa01.pixelpark.net
+
+;port = 443
+
+;user = root
+
+;password = www
+
+dc = test-vmcc
+
+cluster = test-vmcc-l105-01
+
+;folder = templates
+
+;excluded_datastores = vmcb-e2800-sata-02-01
+
+max_nr_templates_stay = 3
+
+[Template]
+
+vm = template1-test.pixelpark.com
+
+;vmware_cfg_version = vmx-13
+
+;os_version = oracleLinux7_64Guest
+
+;data_size_gb = 32
+
+;num_cpus = 2
+
+;ram_mb = 4096
+
+network = 192.168.88.0_23
+
+;name = oracle-linux-7.4-template
+
+mac_address = 00:16:3e:54:ac:2b
+
+
+# vim: filetype=dosini
diff --git a/etc/create-vmware-template-test-cluster2.ini.default b/etc/create-vmware-template-test-cluster2.ini.default
new file mode 100644
index 0000000..6478453
--- /dev/null
+++ b/etc/create-vmware-template-test-cluster2.ini.default
@@ -0,0 +1,42 @@
+[vSphere]
+
+host = test-vcsa01.pixelpark.net
+
+;port = 443
+
+;user = root
+
+;password = www
+
+dc = test-vmcc
+
+cluster = test-vmcc-105-02
+
+;folder = templates
+
+;excluded_datastores = vmcb-e2800-sata-02-01
+
+max_nr_templates_stay = 3
+
+[Template]
+
+vm = template2-test.pixelpark.com
+
+;vmware_cfg_version = vmx-13
+
+;os_version = oracleLinux7_64Guest
+
+;data_size_gb = 32
+
+;num_cpus = 2
+
+;ram_mb = 4096
+
+network = 192.168.88.0_23
+
+;name = oracle-linux-7.4-template
+
+mac_address = 00:16:3e:54:ac:2c
+
+
+# vim: filetype=dosini
diff --git a/etc/create-vmware-template.ini.default b/etc/create-vmware-template.ini.default
index b2373a3..b5feff6 100644
--- a/etc/create-vmware-template.ini.default
+++ b/etc/create-vmware-template.ini.default
@@ -37,6 +37,4 @@
 ;max_wait_for_finish_install = 3600
 
 
-
-
 ; vim: filetype=dosini
diff --git a/python_fb_tools b/python_fb_tools
index 22971db..5522764 160000
--- a/python_fb_tools
+++ b/python_fb_tools
@@ -1 +1 @@
-Subproject commit 22971db392688efea927ec67aca0eb6fe240e886
+Subproject commit 5522764e8ca03bacdf3ccd75c2df8bc4101942db