Merge "Add ability to override public host"
diff --git a/openssh/server/team/members/lmercl.yml b/openssh/server/team/members/lmercl.yml
index c735ed5..04be2f5 100644
--- a/openssh/server/team/members/lmercl.yml
+++ b/openssh/server/team/members/lmercl.yml
@@ -17,4 +17,5 @@
enabled: true
public_keys:
- key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCy6mFrr4oNdLjT5wBZj1+KXNpdawnGGWEevDBQ2SWFjxBFujkWVLiW1kxLTpLVSnuoE5FB7doRIsT/CDe9IU5OhsJ+z6TT56R/pfVKrVnSB1rgrwqdezjgmYEM6kTWiH2GKJE0yiQEPgagK8Rz5Zl420JkhbFWnL7EGPhxNtmYMGDTZwUTzP0KYmytyeH15OqNIiBGTrp1t2bTrVB8HRnUp0uDpfoWAUnsijVGNe1j1bNKtDO0Z9LAWx3eUyxIk4cdpX/EeWJg8jNrSMxtAZZ7Hhm/WInNSNqcHcZ1rEYCAjENxo1WVOuA/aqUqc5xaAipWNon4Rk0e0IUAaFOfLvN2lIuilUZ5XKHDe7a2crkGPnotheT9FgaEHOeFtpuhSaygeZHTMR197jeocgjWIkPqHjVAGSQqQf0TAdNuN73QPTigbbfHWWc1d8KlCM5BqJUXMHPG6BasE1sI/4ykYbxN/DAEvVJ4+rdIlqSdedd73ZAseVQjDtpzD8diScGrpdOhZnTm43q89F8dIFv7tt1TjIwvfcDQNSBjyyKcYpj+NTyW2Zk7qWDVz+lzH0ToYk/rOKkGlrsRy7OwOnmyKR8IcIOL7Bowj895ThCX8tBrdLu/m55ojBOcZiCpawCm7K55ri1Ar6i8cO+bHDh11kKRa/utRRSQTpsW0sbCsamzQ== lubos@lubos-ThinkPad-X1
- user: ${linux:system:user:lmercl}
\ No newline at end of file
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZFmRirw1DHtY8VQDfnZDEi1tWhW4lHWaCq3T14K2HtU17ulJB4KbonMWZLiqFsX44okKM7FOiR9L5ij417CRytlzuHSJebnDj6kppE+lslvfd8TdTTVmvQ7rLj+mdvsRmNVRnou1JPlhryJFshZSsfonn6s6AlAWW4RHx9a8kWuYplObGdUQN9pXReDso9UjeOOuPVmtpfvBXgljHEa/IyAAk47CTe7vVTggauWTVIB+F3zmL2KPFEKGBvd6Ac/wOdirHgV5YgR9LT81hZ9p6TZXkfbIGOl+K6dOIgGqGykn77qloTnKUTSPMWJz11xgwE3sv314ZZ6oZvhCVCcLX lmercl@Luboss-MacBook-Pro.local
+ user: ${linux:system:user:lmercl}
diff --git a/salt/control/sizes/ceph.yml b/salt/control/sizes/ceph.yml
new file mode 100644
index 0000000..7b46367
--- /dev/null
+++ b/salt/control/sizes/ceph.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ salt_control_size_cpu_ceph_mon: 8
+ salt_control_size_ram_ceph_mon: 16384
+ salt_control_size_disk_profile_ceph_mon: large
+ salt_control_size_net_profile_cpu_ceph_mon: default
+ salt_control_size_cpu_ceph_rgw: 8
+ salt_control_size_ram_ceph_rgw: 16384
+ salt_control_size_disk_profile_ceph_rgw: small
+ salt_control_size_net_profile_cpu_ceph_rgw: default
+ salt:
+ control:
+ size:
+ ceph.mon:
+ cpu: ${_param:salt_control_size_cpu_ceph_mon}
+ ram: ${_param:salt_control_size_ram_ceph_mon}
+ disk_profile: ${_param:salt_control_size_disk_profile_ceph_mon}
+ net_profile: ${_param:salt_control_size_net_profile_ceph_mon}
+ ceph.rgw:
+ cpu: ${_param:salt_control_size_cpu_ceph_rgw}
+ ram: ${_param:salt_control_size_ram_ceph_rgw}
+ disk_profile: ${_param:salt_control_size_disk_profile_ceph_rgw}
+ net_profile: ${_param:salt_control_size_net_profile_ceph_rgw}
diff --git a/salt/control/sizes/cicd.yml b/salt/control/sizes/cicd.yml
new file mode 100644
index 0000000..1099649
--- /dev/null
+++ b/salt/control/sizes/cicd.yml
@@ -0,0 +1,14 @@
+parameters:
+ _param:
+ salt_control_size_cpu_cicd_control: 8
+ salt_control_size_ram_cicd_control: 32768
+ salt_control_size_disk_profile_cicd_control: huge
+ salt_control_size_net_profile_cpu_cicd_control: default
+ salt:
+ control:
+ size:
+ cicd.control:
+ cpu: ${_param:salt_control_size_cpu_cicd_control}
+ ram: ${_param:salt_control_size_ram_cicd_control}
+ disk_profile: ${_param:salt_control_size_disk_profile_cicd_control}
+ net_profile: ${_param:salt_control_size_net_profile_cicd_control}
diff --git a/salt/control/sizes/opencontrail.yml b/salt/control/sizes/opencontrail.yml
new file mode 100644
index 0000000..85a348d
--- /dev/null
+++ b/salt/control/sizes/opencontrail.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ salt_control_size_cpu_opencontrail_control: 8
+ salt_control_size_ram_opencontrail_control: 65536
+ salt_control_size_disk_profile_opencontrail_control: large
+ salt_control_size_net_profile_cpu_opencontrail_control: default
+ salt_control_size_cpu_opencontrail_analytics: 16
+ salt_control_size_ram_opencontrail_analytics: 98304
+ salt_control_size_disk_profile_opencontrail_analytics: huge
+ salt_control_size_net_profile_cpu_opencontrail_analytics: default
+ salt:
+ control:
+ size:
+ opencontrail.control:
+ cpu: ${_param:salt_control_size_cpu_opencontrail_control}
+ ram: ${_param:salt_control_size_ram_opencontrail_control}
+ disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_control}
+ net_profile: ${_param:salt_control_size_net_profile_opencontrail_control}
+ opencontrail.analytics:
+ cpu: ${_param:salt_control_size_cpu_opencontrail_analytics}
+ ram: ${_param:salt_control_size_ram_opencontrail_analytics}
+ disk_profile: ${_param:salt_control_size_disk_profile_opencontrail_analytics}
+ net_profile: ${_param:salt_control_size_net_profile_opencontrail_analytics}
diff --git a/salt/control/sizes/openstack.yml b/salt/control/sizes/openstack.yml
new file mode 100644
index 0000000..4283c73
--- /dev/null
+++ b/salt/control/sizes/openstack.yml
@@ -0,0 +1,50 @@
+parameters:
+ _param:
+ salt_control_size_cpu_openstack_control: 8
+ salt_control_size_ram_openstack_control: 65536
+ salt_control_size_disk_profile_openstack_control: large
+ salt_control_size_net_profile_cpu_openstack_control: default
+ salt_control_size_cpu_openstack_database: 8
+ salt_control_size_ram_openstack_database: 32768
+ salt_control_size_disk_profile_openstack_database: large
+ salt_control_size_net_profile_cpu_openstack_database: default
+ salt_control_size_cpu_openstack_message_queue: 16
+ salt_control_size_ram_openstack_message_queue: 65536
+ salt_control_size_disk_profile_openstack_message_queue: xxlarge
+ salt_control_size_net_profile_cpu_openstack_message_queue: default
+ salt_control_size_cpu_openstack_proxy: 4
+ salt_control_size_ram_openstack_proxy: 16384
+ salt_control_size_disk_profile_openstack_proxy: large
+ salt_control_size_net_profile_cpu_openstack_proxy: default
+ salt_control_size_cpu_openstack_upgrade: 8
+ salt_control_size_ram_openstack_upgrade: 16384
+ salt_control_size_disk_profile_openstack_upgrade: medium
+ salt_control_size_net_profile_cpu_openstack_upgrade: default
+ salt:
+ control:
+ size:
+ openstack.control:
+ cpu: ${_param:salt_control_size_cpu_openstack_control}
+ ram: ${_param:salt_control_size_ram_openstack_control}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_control}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_control}
+ openstack.database:
+ cpu: ${_param:salt_control_size_cpu_openstack_database}
+ ram: ${_param:salt_control_size_ram_openstack_database}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_database}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_database}
+ openstack.message_queue:
+ cpu: ${_param:salt_control_size_cpu_openstack_message_queue}
+ ram: ${_param:salt_control_size_ram_openstack_message_queue}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_message_queue}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_message_queue}
+ openstack.proxy:
+ cpu: ${_param:salt_control_size_cpu_openstack_proxy}
+ ram: ${_param:salt_control_size_ram_openstack_proxy}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_proxy}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_proxy}
+ openstack.upgrade:
+ cpu: ${_param:salt_control_size_cpu_openstack_upgrade}
+ ram: ${_param:salt_control_size_ram_openstack_upgrade}
+ disk_profile: ${_param:salt_control_size_disk_profile_openstack_upgrade}
+ net_profile: ${_param:salt_control_size_net_profile_openstack_upgrade}
diff --git a/salt/control/sizes/stacklight.yml b/salt/control/sizes/stacklight.yml
new file mode 100644
index 0000000..50f2803
--- /dev/null
+++ b/salt/control/sizes/stacklight.yml
@@ -0,0 +1,23 @@
+parameters:
+ _param:
+ salt_control_size_cpu_stacklight_log: 8
+ salt_control_size_ram_stacklight_log: 16384
+ salt_control_size_disk_profile_stacklight_log: large
+ salt_control_size_net_profile_cpu_stacklight_log: default
+ salt_control_size_cpu_stacklight_server: 8
+ salt_control_size_ram_stacklight_server: 16384
+ salt_control_size_disk_profile_stacklight_server: large
+ salt_control_size_net_profile_cpu_stacklight_server: default
+ salt:
+ control:
+ size:
+ stacklight.log:
+ cpu: ${_param:salt_control_size_cpu_stacklight_log}
+ ram: ${_param:salt_control_size_ram_stacklight_log}
+ disk_profile: ${_param:salt_control_size_disk_profile_stacklight_log}
+ net_profile: ${_param:salt_control_size_net_profile_stacklight_log}
+ stacklight.server:
+ cpu: ${_param:salt_control_size_cpu_stacklight_server}
+ ram: ${_param:salt_control_size_ram_stacklight_server}
+ disk_profile: ${_param:salt_control_size_disk_profile_stacklight_server}
+ net_profile: ${_param:salt_control_size_net_profile_stacklight_server}
\ No newline at end of file