From fc041965f4edf88b23a34b8a4f826035bb4f9d99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 12 May 2023 17:01:50 +0200 Subject: [PATCH 1/2] Update Ubuntu base image --- site-cookbooks/kosmos_kvm/attributes/default.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos_kvm/attributes/default.rb b/site-cookbooks/kosmos_kvm/attributes/default.rb index dc2b563..102a336 100644 --- a/site-cookbooks/kosmos_kvm/attributes/default.rb +++ b/site-cookbooks/kosmos_kvm/attributes/default.rb @@ -1,8 +1,8 @@ -ubuntu_server_cloud_image_release = "20220810" +ubuntu_server_cloud_image_release = "20230506" node.default["kosmos_kvm"]["host"]["qemu_base_image"] = { "url" => "https://cloud-images.ubuntu.com/releases/focal/release-#{ubuntu_server_cloud_image_release}/ubuntu-20.04-server-cloudimg-amd64-disk-kvm.img", - "checksum" => "6db74917f85146569cb6ae89e1d163ac6d1e488a7f32bc74761ec6d1869c714f", + "checksum" => "27d2b91fd2b715729d739e2a3155dce70d1aaae4f05c177f338b9d4b60be638c", "path" => "/var/lib/libvirt/images/base/ubuntu-20.04-server-cloudimg-amd64-disk-kvm-#{ubuntu_server_cloud_image_release}.qcow2" } From 29052ce509481f147444375a4be8a594441a3fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 12 May 2023 17:02:10 +0200 Subject: [PATCH 2/2] Deploy new VMs for Redis, Liquor Cabinet --- clients/lq-1.json | 4 +++ clients/lq-2.json | 4 +++ clients/redis-1.json | 4 +++ clients/redis-2.json | 4 +++ nodes/draco.kosmos.org.json | 3 +- nodes/lq-1.json | 56 +++++++++++++++++++++++++++++++++++++ nodes/lq-2.json | 56 +++++++++++++++++++++++++++++++++++++ nodes/redis-1.json | 56 +++++++++++++++++++++++++++++++++++++ nodes/redis-2.json | 56 +++++++++++++++++++++++++++++++++++++ 9 files changed, 241 insertions(+), 2 deletions(-) create mode 100644 clients/lq-1.json create mode 100644 clients/lq-2.json create mode 100644 clients/redis-1.json create mode 100644 clients/redis-2.json create mode 100644 nodes/lq-1.json create mode 100644 nodes/lq-2.json create mode 100644 nodes/redis-1.json create mode 100644 nodes/redis-2.json diff --git a/clients/lq-1.json b/clients/lq-1.json new file mode 100644 index 0000000..a7807b2 --- /dev/null +++ b/clients/lq-1.json @@ -0,0 +1,4 @@ +{ + "name": "lq-1", + "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6mrJdvfx2pvuYIOCwDe4\nXJ4NJSEq+9oyqW/JWNDnUN/GAZLCfTOa+qu1nA8sOspWWpaikHpo2meYlzA1HCPh\nF4LX7C83dA9CXB8BDCddmkAxhPPXIeFM3AmaEwfv+dLYNuO6bWvOKcHjJdw7Mp4W\nrdg9MsIh28W9jf7KehvPWx3ZvrJm2vyiFGQNBDWGdkVq40P2lhvCISvWb+Ugpjos\nJzq/HZNFq6Fc72jWfwwGcDgwfc1/jmWJlz2J5v8xHwwhVtcWTg1AWqfcVQZ6OKtf\nwP6s/pAK4dAXqPz8OE17GPJ42r94AeWr39Cn5b8EzrVhKOeODlpihfzIaa/sfb44\n6wIDAQAB\n-----END PUBLIC KEY-----\n" +} \ No newline at end of file diff --git a/clients/lq-2.json b/clients/lq-2.json new file mode 100644 index 0000000..9b2f278 --- /dev/null +++ b/clients/lq-2.json @@ -0,0 +1,4 @@ +{ + "name": "lq-2", + "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzyquIPPckL4Bybw4H0t6\nHexR7u97//eXBGpN+PJcp3PAUTJVWr1m7uDnpD9JAP370Cp05Tz0ydYXk/2NTpFf\nvRu20401VWTWbClIdN7n89edtER/XX90KrcKplV4bZcFN0UC2Il6SGH0uvUYzZRr\nPV2eXftDvu7Mhl1xlmeJ0S6bH95v1G2k6TrTLAOBs6gpqiCWyjrNB9AY3SpEv9Ya\nK8T0M10LAY0UwKccSp/eTZzCfbmzvNIyyRlJbzEAsHmoDPyR2/4LB1ndtbkTszmk\noHvpBJu3noKXo0SW/WqhSvwxBVV0bZUYjgH3Bx8nudNkHgL6ZH6FVQ6ED+70jWiq\ngwIDAQAB\n-----END PUBLIC KEY-----\n" +} \ No newline at end of file diff --git a/clients/redis-1.json b/clients/redis-1.json new file mode 100644 index 0000000..d3bc445 --- /dev/null +++ b/clients/redis-1.json @@ -0,0 +1,4 @@ +{ + "name": "redis-1", + "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7J/jWx6xCoz3ECDA9gr6\nAVVjd3MhE9LmE/bFLdQLariJjyNxJ1qLp/SN1P/H/aBS9YP6HEGkkTekRkWrHkDr\n5pliR9lmdS7c1W2pRKOaBm8r3pl98fBcFtxrkEhlULX5XMUCeGqANjDYeswaKYGb\nYF/OPsL2ZyIzUiejIVoPR9kuCWA8DNa1whgO84r2gMkBSzGu8hAhBoAlXQAoZWWj\nem3sNNwA9X+0WVGuG0X+RxdzNnZ6o28f5UZuDTCuMjJubKM4qg5uuwFtSXHoW8nU\nGl6Y7Owmqsdkh8ZCM8gA4lPu5Kh6XatqQ6Gzq0PXFyCykuXzJRwW4ZVCKC+UyhA0\nQQIDAQAB\n-----END PUBLIC KEY-----\n" +} \ No newline at end of file diff --git a/clients/redis-2.json b/clients/redis-2.json new file mode 100644 index 0000000..64ca777 --- /dev/null +++ b/clients/redis-2.json @@ -0,0 +1,4 @@ +{ + "name": "redis-2", + "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzjHtl5iChC5+uxr9YrQu\n3x4zihlVZGk+fYlpbHg2hV880NslRb1MJYFTaKcJrYmgVAnMaKZjfA4fGsWQ3tDl\n/2JcA95U0Soj9BMwr1EUfvna587xS5DnYNCd+OkVtNwqujdoU8Use13UcpwnaN4V\n/9bslQdw2qDeVmeqx7bfTvsATIedWt9eseMR/qnsMd9Rkz/Q3xJ9NgIdQL6cC7uf\nN6H/B+Y+qV5Kv84nwrkTGPyzNOt21mfzeYOiAMGUTUoS+l38hA4ehfVxb8dWTmNa\n8QENbx6DKP5xUEyCiluzFp5jiGJu9xSDngndLVsQ7de5+KvxTjfipczmrWSjPuYB\nXQIDAQAB\n-----END PUBLIC KEY-----\n" +} \ No newline at end of file diff --git a/nodes/draco.kosmos.org.json b/nodes/draco.kosmos.org.json index 3f4d759..fdc850e 100644 --- a/nodes/draco.kosmos.org.json +++ b/nodes/draco.kosmos.org.json @@ -28,7 +28,6 @@ "kosmos_kvm::backup", "kosmos-ejabberd::firewall", "kosmos-ipfs::firewall_swarm", - "kosmos-ipfs::firewall_public_gateway", "kosmos-bitcoin::firewall", "kosmos_zerotier::firewall", "kosmos-nginx::firewall", @@ -76,4 +75,4 @@ "recipe[kosmos-nginx::firewall]", "recipe[sockethub::firewall]" ] -} +} \ No newline at end of file diff --git a/nodes/lq-1.json b/nodes/lq-1.json new file mode 100644 index 0000000..c969a94 --- /dev/null +++ b/nodes/lq-1.json @@ -0,0 +1,56 @@ +{ + "name": "lq-1", + "normal": { + "knife_zero": { + "host": "10.1.1.87" + } + }, + "automatic": { + "fqdn": "lq-1", + "os": "linux", + "os_version": "5.4.0-1090-kvm", + "hostname": "lq-1", + "ipaddress": "192.168.122.158", + "roles": [ + "base", + "kvm_guest" + ], + "recipes": [ + "kosmos-base", + "kosmos-base::default", + "kosmos_kvm::guest", + "apt::default", + "timezone_iii::default", + "timezone_iii::debian", + "ntp::default", + "ntp::apparmor", + "kosmos-base::systemd_emails", + "apt::unattended-upgrades", + "kosmos-base::firewall", + "kosmos-postfix::default", + "postfix::default", + "postfix::_common", + "postfix::_attributes", + "postfix::sasl_auth", + "hostname::default" + ], + "platform": "ubuntu", + "platform_version": "20.04", + "cloud": null, + "chef_packages": { + "chef": { + "version": "18.2.7", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.2.7/lib", + "chef_effortless": null + }, + "ohai": { + "version": "18.1.4", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai" + } + } + }, + "run_list": [ + "role[base]", + "role[kvm_guest]" + ] +} \ No newline at end of file diff --git a/nodes/lq-2.json b/nodes/lq-2.json new file mode 100644 index 0000000..8174bc6 --- /dev/null +++ b/nodes/lq-2.json @@ -0,0 +1,56 @@ +{ + "name": "lq-2", + "normal": { + "knife_zero": { + "host": "10.1.1.188" + } + }, + "automatic": { + "fqdn": "lq-2", + "os": "linux", + "os_version": "5.4.0-1090-kvm", + "hostname": "lq-2", + "ipaddress": "192.168.122.47", + "roles": [ + "base", + "kvm_guest" + ], + "recipes": [ + "kosmos-base", + "kosmos-base::default", + "kosmos_kvm::guest", + "apt::default", + "timezone_iii::default", + "timezone_iii::debian", + "ntp::default", + "ntp::apparmor", + "kosmos-base::systemd_emails", + "apt::unattended-upgrades", + "kosmos-base::firewall", + "kosmos-postfix::default", + "postfix::default", + "postfix::_common", + "postfix::_attributes", + "postfix::sasl_auth", + "hostname::default" + ], + "platform": "ubuntu", + "platform_version": "20.04", + "cloud": null, + "chef_packages": { + "chef": { + "version": "18.2.7", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.2.7/lib", + "chef_effortless": null + }, + "ohai": { + "version": "18.1.4", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai" + } + } + }, + "run_list": [ + "role[base]", + "role[kvm_guest]" + ] +} \ No newline at end of file diff --git a/nodes/redis-1.json b/nodes/redis-1.json new file mode 100644 index 0000000..8ba41ee --- /dev/null +++ b/nodes/redis-1.json @@ -0,0 +1,56 @@ +{ + "name": "redis-1", + "normal": { + "knife_zero": { + "host": "10.1.1.225" + } + }, + "automatic": { + "fqdn": "redis-1", + "os": "linux", + "os_version": "5.4.0-1090-kvm", + "hostname": "redis-1", + "ipaddress": "192.168.122.83", + "roles": [ + "base", + "kvm_guest" + ], + "recipes": [ + "kosmos-base", + "kosmos-base::default", + "kosmos_kvm::guest", + "apt::default", + "timezone_iii::default", + "timezone_iii::debian", + "ntp::default", + "ntp::apparmor", + "kosmos-base::systemd_emails", + "apt::unattended-upgrades", + "kosmos-base::firewall", + "kosmos-postfix::default", + "postfix::default", + "postfix::_common", + "postfix::_attributes", + "postfix::sasl_auth", + "hostname::default" + ], + "platform": "ubuntu", + "platform_version": "20.04", + "cloud": null, + "chef_packages": { + "chef": { + "version": "18.2.7", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.2.7/lib", + "chef_effortless": null + }, + "ohai": { + "version": "18.1.4", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai" + } + } + }, + "run_list": [ + "role[base]", + "role[kvm_guest]" + ] +} \ No newline at end of file diff --git a/nodes/redis-2.json b/nodes/redis-2.json new file mode 100644 index 0000000..38735df --- /dev/null +++ b/nodes/redis-2.json @@ -0,0 +1,56 @@ +{ + "name": "redis-2", + "normal": { + "knife_zero": { + "host": "10.1.1.208" + } + }, + "automatic": { + "fqdn": "redis-2", + "os": "linux", + "os_version": "5.4.0-1090-kvm", + "hostname": "redis-2", + "ipaddress": "192.168.122.98", + "roles": [ + "base", + "kvm_guest" + ], + "recipes": [ + "kosmos-base", + "kosmos-base::default", + "kosmos_kvm::guest", + "apt::default", + "timezone_iii::default", + "timezone_iii::debian", + "ntp::default", + "ntp::apparmor", + "kosmos-base::systemd_emails", + "apt::unattended-upgrades", + "kosmos-base::firewall", + "kosmos-postfix::default", + "postfix::default", + "postfix::_common", + "postfix::_attributes", + "postfix::sasl_auth", + "hostname::default" + ], + "platform": "ubuntu", + "platform_version": "20.04", + "cloud": null, + "chef_packages": { + "chef": { + "version": "18.2.7", + "chef_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/chef-18.2.7/lib", + "chef_effortless": null + }, + "ohai": { + "version": "18.1.4", + "ohai_root": "/opt/chef/embedded/lib/ruby/gems/3.1.0/gems/ohai-18.1.4/lib/ohai" + } + } + }, + "run_list": [ + "role[base]", + "role[kvm_guest]" + ] +} \ No newline at end of file