Merge pull request #29 from simonpasquier/fix-authorized-keys
Move authorized key for root to an optional class
diff --git a/ccp/control/service/neutron_contrail.yml b/ccp/control/service/neutron_contrail.yml
new file mode 100644
index 0000000..6bd75fe
--- /dev/null
+++ b/ccp/control/service/neutron_contrail.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ccp.control.service.neutron_contrail
diff --git a/ccp/control/service/neutron_ovs.yml b/ccp/control/service/neutron_ovs.yml
new file mode 100644
index 0000000..7225029
--- /dev/null
+++ b/ccp/control/service/neutron_ovs.yml
@@ -0,0 +1,2 @@
+classes:
+- service.ccp.control.service.neutron_ovs
diff --git a/ccp/control/service/openstack_control.yml b/ccp/control/service/openstack_control.yml
new file mode 100644
index 0000000..187a7bf
--- /dev/null
+++ b/ccp/control/service/openstack_control.yml
@@ -0,0 +1,5 @@
+classes:
+- service.ccp.control.service.keystone
+- service.ccp.control.service.nova_controller
+parameters:
+ _param: {}
diff --git a/ccp/control/single.yml b/ccp/control/single.yml
new file mode 100644
index 0000000..c64ea84
--- /dev/null
+++ b/ccp/control/single.yml
@@ -0,0 +1,9 @@
+classes:
+- service.ccp.control.single
+- service.ccp.control.service.etcd
+parameters:
+ _param:
+ ccp_public_interface: eth0
+ ccp_private_interface: eth0
+ ccp_kubernetes_host: 127.0.0.1
+ ccp_control_namespace: ccp
diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 283e9d9..d4ec5da 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -1,6 +1,27 @@
classes:
- service.ceilometer.agent.cluster
parameters:
+ ceilometer:
+ agent:
+ enabled: true
+ version: ${_param:ceilometer_version}
+ secret: ${_param:ceilometer_secret_key}
+ identity:
+ engine: keystone
+ host: ${_param:keystone_service_host}
+ port: 35357
+ tenant: service
+ user: ceilometer
+ password: ${_param:keystone_ceilometer_password}
+ message_queue:
+ engine: rabbitmq
+ host: ${_param:openstack_message_queue_address}
+ port: 5672
+ user: openstack
+ password: ${_param:rabbitmq_openstack_password}
+ virtual_host: '/openstack'
+ ha_queues: true
+ rpc_thread_pool_size: 5
nova:
compute:
notification:
diff --git a/elasticsearch/server/cluster.yml b/elasticsearch/server/cluster.yml
index efb70f3..8f53f21 100644
--- a/elasticsearch/server/cluster.yml
+++ b/elasticsearch/server/cluster.yml
@@ -1,7 +1,5 @@
classes:
- service.elasticsearch.server.cluster
-- service.haproxy.proxy.single
-- service.keepalived.cluster.single
- service.java.environment
parameters:
_param:
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index 7eca116..b27ac38 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -81,7 +81,7 @@
network:
engine: neutron
region: ${_param:openstack_region}
- host: ${_param:opencontrail_control_address}
+ host: ${_param:neutron_service_host}
port: 9696
user: neutron
tenant: service
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 2fb47fb..ac08d43 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -59,11 +59,11 @@
network:
engine: neutron
region: ${_param:openstack_region}
- host: ${_param:opencontrail_control_address}
+ host: ${_param:neutron_service_host}
user: neutron
password: ${_param:keystone_neutron_password}
port: 9696
mtu: 1500
tenant: service
metadata:
- password: metadataPass
\ No newline at end of file
+ password: metadataPass
diff --git a/openssh/server/team/tcpcloud.yml b/openssh/server/team/tcpcloud.yml
index 562dc3d..85b20f5 100644
--- a/openssh/server/team/tcpcloud.yml
+++ b/openssh/server/team/tcpcloud.yml
@@ -98,6 +98,12 @@
sudo: true
full_name: Richard Felkl
home: /home/rfelkl
+ tkukral:
+ enabled: true
+ name: tkukral
+ sudo: true
+ full_name: Tomas Kukral
+ home: /home/tkukral
group:
libvirtd:
enabled: true
@@ -181,6 +187,11 @@
public_keys:
- ${public_keys:rfelkl}
user: ${linux:system:user:rfelkl}
+ tkukral:
+ enabled: true
+ public_keys:
+ - ${public_keys:tkukral}
+ user: ${linux:system:user:tkukral}
public_keys:
askotnicky:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDO6EnDYaGdF/Nn6lntxDNnKanCsheZRdh8kA/6ImyeRSjT2cgepm1Fsgv7wXBYoy0OxhB5wgCp5Az/Pj4oLkG3g+G05sUPUxxGCGRiwjcnyQ/FTz4TzHglAVqgbdgWoQYf9Hg6EKZovvPcH3STbEwcl+MhLqvxz0wm5+StE+wvp6I9dEfRV+2/e1uepauOTZ1+Ui1DMNXiMefTlbiIBHzUk7RiwJWgqzQXBndgunmbJWSed8zC0Ug97waDOFIX/oKZmAmsv0NLJ2e/kC3oUTuziGT74F9sh7Pqiw/9HZxvP45hJwEvytfUjfuiikIBbmYdF7Je93czaG/qjXGN8YvP== a.skotnicky@tcpisek.cz
@@ -212,5 +223,5 @@
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCBPHunnzTMg2I88ZIaiQ5eJYJRq/hQcB5UtDZTC7hO0ce+oEpftcLQiQ69xKbOPb5xiK6VMJd6a53gZykabMTov6y+nECMr4B1i6tgK1NPCU/sGhvsUKeiRo7ZVMScRPuJuTGRLjR6Ac3pRrwrWpmoRvJtLnbrvjEYlt9V7ui/VFkl7uiPQc3AjNiSkgBekDGtrqZktjUstEosucjfriF/PVtlZqha7d3rHLpK1KBzzaSMNMxCgBitEtqjgHLtcR1H/KgPQpYAwkokmvAGH8/fqcd+tpmp6hiH3k2Haf8EjVBTcw71fbmqC0rpL8/r74jyYAmkfPG8LISb/T9gPcV jiri@jiri-Mirantis
rfelkl:
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlvQKWbEQ8bM2rtE35sA5+y//YKMLNJ48d+/RxWlUx6G8xJusUhrKZuMRMgN5NqJQ92Z0Yd2lulsPeKEfSbqAxBxmNZ+mAAy8w8P/BHlQImi2HgMpWtQ5yExsAvCUAqq6KclJBhzjArg4+ztmKmNvjM8ZktJYeCM8VJ+qT01B8/3+frgltIDCDcC8YpRwbAt7aLjuB2Jk5Q9daQbtZ4XyXwHgPDpyZUkcuueUk/iklUBkAh9P3CFJBpttXEyKI0+cJAtM9vCXXPWmWt7nFAyQ8nH9+lTv/ZuD+pipKJBW2sp8+fFUWJ/Z6GzWhyh2KxiY7eK3kgabg1i7FtLFtRbZj richard@richard-inspiron
-
-
+ tkukral:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRM6WquKic6i6v/JbNR2XuMqCCYqlfyGU1K7XHK7tWFordRLz2/o4S76sZULBTXR0rLHtynvHM4QHlloE1/XJnd0BtI/3y8aY0OkXyu6PHvTC8Az8SyGj2XAcaiPlaT2f+oTJHoPc9rxLhMMD7OTwias6QeVKB3UrT0OaHfy2wWCF7t8cQeofi2ldEHKeCsC1jrT1vaVuoThQgZ00h0rNk4COPZEW34FXdmdJFUmZcUIDMa71HtYgnn4gmE8sUiJ/j6ardvPaycCDT9j1GW1Yu6UVLBWOoMMCb04bDJiidlvY1fQqbM/G4cR4ZPHFZ0RQiM2+wnRaB5RCmBVgNT0Tj tkukral
diff --git a/reclass/storage/system/openstack_gateway_cluster.yml b/reclass/storage/system/openstack_gateway_cluster.yml
index 30e04ab..72e31c5 100644
--- a/reclass/storage/system/openstack_gateway_cluster.yml
+++ b/reclass/storage/system/openstack_gateway_cluster.yml
@@ -2,6 +2,11 @@
_param:
openstack_gateway_node01_hostname: gtw01
openstack_gateway_node02_hostname: gtw02
+ openstack_gateway_node03_hostname: gtw03
+
+ openstack_gateway_node01_tenant_address: ${_param:single_address}
+ openstack_gateway_node02_tenant_address: ${_param:single_address}
+ openstack_gateway_node03_tenant_address: ${_param:single_address}
reclass:
storage:
node:
@@ -14,6 +19,7 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
single_address: ${_param:openstack_gateway_node01_address}
+ tenant_address: ${_param:openstack_gateway_node01_tenant_address}
openstack_gateway_node02:
name: ${_param:openstack_gateway_node02_hostname}
domain: ${_param:cluster_domain}
@@ -23,4 +29,16 @@
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: trusty
single_address: ${_param:openstack_gateway_node02_address}
+ tenant_address: ${_param:openstack_gateway_node02_tenant_address}
+ openstack_gateway_node03:
+ name: ${_param:openstack_gateway_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.openstack.gateway
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: trusty
+ single_address: ${_param:openstack_gateway_node03_address}
+ tenant_address: ${_param:openstack_gateway_node03_tenant_address}
+