Merge pull request #114 from smolaon/master
VW fixes vol2
diff --git a/ceilometer/client/init.yml b/ceilometer/client/init.yml
index 3534de7..5a0aaa0 100644
--- a/ceilometer/client/init.yml
+++ b/ceilometer/client/init.yml
@@ -2,4 +2,5 @@
- system.ceilometer.client.cinder_control
- system.ceilometer.client.keystone
- system.ceilometer.client.glance
-- system.ceilometer.client.heat
\ No newline at end of file
+- system.ceilometer.client.heat
+- system.ceilometer.client.nova_control
\ No newline at end of file
diff --git a/ceilometer/client/nova_compute.yml b/ceilometer/client/nova_compute.yml
new file mode 100644
index 0000000..57e900a
--- /dev/null
+++ b/ceilometer/client/nova_compute.yml
@@ -0,0 +1,7 @@
+parameters:
+ nova:
+ compute:
+ notification:
+ driver: messagingv2
+ notify_on:
+ state_change: vm_and_task_state
\ No newline at end of file
diff --git a/ceilometer/client/nova_control.yml b/ceilometer/client/nova_control.yml
new file mode 100644
index 0000000..252c67e
--- /dev/null
+++ b/ceilometer/client/nova_control.yml
@@ -0,0 +1,5 @@
+parameters:
+ nova:
+ controller:
+ notification:
+ driver: messagingv2
diff --git a/ceph/radosgw/single.yml b/ceph/radosgw/single.yml
new file mode 100644
index 0000000..31bdc7d
--- /dev/null
+++ b/ceph/radosgw/single.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ radosgw_keyring_path: /etc/ceph/ceph.client.radosgw.keyring
+ ceph:
+ radosgw:
+ enabled: true
+ client:
+ config:
+ client.radosgw.gateway:
+ rgw_keystone_accepted_roles: "_member_, Member, admin, swiftoperator"
+ keyring: /etc/ceph/ceph.client.radosgw.keyring
+ rgw_socket_path: /tmp/radosgw.sock
+ rgw_keystone_revocation_interval: 60
+ rgw_keystone_url: ${_param:keystone_service_host}:5000
+ rgw_keystone_admin_token: ${_param:keystone_service_token}
+ host: ${linux:system:name}
+ rgw_dns_name : ${_param:cluster_domain}
+ rgw_print_continue: True
+ rgw_content_length_compat: true
+ user: www-data
diff --git a/haproxy/proxy/listen/stacklight/influxdb.yml b/haproxy/proxy/listen/stacklight/influxdb.yml
index 8ab700f..02e25d7 100644
--- a/haproxy/proxy/listen/stacklight/influxdb.yml
+++ b/haproxy/proxy/listen/stacklight/influxdb.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ cluster_influxdb_port: ${_param:influxdb_port}
haproxy:
proxy:
listen:
diff --git a/heka/ceilometer_collector/single.yml b/heka/ceilometer_collector/single.yml
index 4670ade..a1fd11c 100644
--- a/heka/ceilometer_collector/single.yml
+++ b/heka/ceilometer_collector/single.yml
@@ -6,7 +6,7 @@
ceilometer_collector:
enabled: true
influxdb_database: ceilometer
- influxdb_host: ${_param:stacklight_monitor_node01_address}
+ influxdb_host: ${_param:stacklight_telemetry_address}
influxdb_password: ${_param:ceilometer_influxdb_password}
influxdb_port: 8086
influxdb_username: ceilometer
diff --git a/nginx/server/proxy/ceph_radosgw.yml b/nginx/server/proxy/ceph_radosgw.yml
new file mode 100644
index 0000000..fe90201
--- /dev/null
+++ b/nginx/server/proxy/ceph_radosgw.yml
@@ -0,0 +1,15 @@
+parameters:
+ _param:
+ nginx_proxy_radosgw_host: ${_param:cluster_public_host}
+ nginx:
+ server:
+ enabled: true
+ site:
+ ceph_radosgw:
+ enabled: true
+ type: ceph
+ name: ceph_radosgw
+ host:
+ name: ${_param:nginx_proxy_radosgw_host}
+ port: 8080
+ ssl: ${_param:nginx_proxy_ssl}
\ No newline at end of file
diff --git a/nginx/server/proxy/openstack/ceilometer.yml b/nginx/server/proxy/openstack/ceilometer.yml
new file mode 100644
index 0000000..664c69e
--- /dev/null
+++ b/nginx/server/proxy/openstack/ceilometer.yml
@@ -0,0 +1,20 @@
+parameters:
+ _param:
+ nginx_proxy_openstack_api_host: ${_param:cluster_public_host}
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_proxy_openstack_api_keystone:
+ enabled: true
+ type: nginx_proxy
+ name: openstack_api_keystone
+ check: false
+ proxy:
+ host: ${_param:keystone_service_host}
+ port: 8777
+ protocol: http
+ host:
+ name: ${_param:nginx_proxy_openstack_api_host}
+ port: 8777
+ ssl: ${_param:nginx_proxy_ssl}
\ No newline at end of file
diff --git a/openssh/server/team/services_qa.yml b/openssh/server/team/services_qa.yml
index 6f7595c..ca75b5a 100644
--- a/openssh/server/team/services_qa.yml
+++ b/openssh/server/team/services_qa.yml
@@ -8,6 +8,12 @@
sudo: true
full_name: Nikolay Pliashechnykov
home: /home/npliashechnikov
+ mchernik:
+ enabled: true
+ name: mchernik
+ sudo: true
+ full_name: Mikhail Chernik
+ home: /home/mchernik
openssh:
server:
enabled: true
@@ -17,6 +23,13 @@
public_keys:
- ${public_keys:npliashechnikov}
user: ${linux:system:user:npliashechnikov}
+ mchernik:
+ enabled: true
+ public_keys:
+ - ${public_keys:mchernik}
+ user: ${linux:system:user:mchernik}
public_keys:
npliashechnikov:
key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAxy9ZNE+36U1W3vPxzMx++AujS8Ay9ZgJrfaa6YsWl1FeN87VuGucslHjLqFfiIYJLQl3m7tSLiAujQ/izBKDbfA5hd5z7JaCRB1LE+CehmCL0UVwsHflAi0tPn1tDrTcVGf/BRH0FsoZJo+KpOwohYGN8BMOpUIAP2SkGrE7cGbPrd9NbRqPW80iyIzsNIqzVKTcsh0CcJcr05V5n3or0GvteDMxl+mjAi6hpfx06a/bEfPLV10Ftl4+nIkbXr0KWA68uy7XmTlH+qgVUCMGwRP4mFaU63+uX45WboLKQ0aacPX833qvZJTIPe2FhAygoVoBwgOKBzrbnicBa9U+AQ== dkth1p3@lxf01p581
+ mchernik:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiYzcWNIP1K3DnSfztIZdMTl6zSr133eixsHDWWqI71Fj5UOny4kMH2P/qYk0WHhm7P9kwBNDgmJBY/eO5jb00D2w9BGHyvsOnkpAgzw5neL4ivRT7qLWkRdbcLo8AAFQN7VW+bgMb8gFfYWfttHyfkbJOQlU2xmi8fvhQ+2IM/12S0f0lP2uIYgVn8g9f+1OmtXKOWi/cKx0+6NYsuFjM2oVRlBhwlhPD2mI00rSL6zYjz/8GapPPkylQnds09NueNmrScjsPmJl6lPzU8maxHABZ/KctIZW/0ucMolv/3Ybm5FJIsj6YGUdz7AWzdE9o4tSfugFR3P7Ng/scxXpZ migel@mungo
diff --git a/salt/master/formula/pkg/foundation.yml b/salt/master/formula/pkg/foundation.yml
index 4b2b669..abcc1b0 100644
--- a/salt/master/formula/pkg/foundation.yml
+++ b/salt/master/formula/pkg/foundation.yml
@@ -16,3 +16,7 @@
jenkins:
source: pkg
name: salt-formula-jenkins
+ freeipa:
+ source: pkg
+ name: salt-formula-freeipa
+