Merge pull request #20 from simonpasquier/fix-influxdb-configuration
Fix InfluxDB parameters
diff --git a/glusterfs/client/volume/glance.yml b/glusterfs/client/volume/glance.yml
index c266a2f..66a4166 100644
--- a/glusterfs/client/volume/glance.yml
+++ b/glusterfs/client/volume/glance.yml
@@ -1,9 +1,11 @@
parameters:
+ _param:
+ glance_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
glance:
path: /var/lib/glance/images
- server: ${_param:glusterfs_service_host}
+ server: ${_param:glance_glusterfs_service_host}
user: glance
group: glance
diff --git a/glusterfs/client/volume/keystone.yml b/glusterfs/client/volume/keystone.yml
index 1ebd908..188ea03 100644
--- a/glusterfs/client/volume/keystone.yml
+++ b/glusterfs/client/volume/keystone.yml
@@ -1,9 +1,11 @@
parameters:
+ _param:
+ keystone_glusterfs_service_host: ${_param:glusterfs_service_host}
glusterfs:
client:
volumes:
keystone-keys:
path: /var/lib/keystone/fernet-keys
- server: ${_param:glusterfs_service_host}
+ server: ${_param:keystone_glusterfs_service_host}
user: keystone
group: keystone
\ No newline at end of file
diff --git a/graphite/server/single.yml b/graphite/server/single.yml
index b6d507a..364877e 100644
--- a/graphite/server/single.yml
+++ b/graphite/server/single.yml
@@ -37,4 +37,4 @@
rights: all privileges
supervisor:
server:
- enabled: false
+ enabled: true
diff --git a/linux/system/repo/grafana.yml b/linux/system/repo/grafana.yml
index 267065e..c1c8a5b 100644
--- a/linux/system/repo/grafana.yml
+++ b/linux/system/repo/grafana.yml
@@ -1,7 +1,8 @@
+parameters:
linux:
system:
repo:
grafana:
enabled: true
source: 'deb https://packagecloud.io/grafana/stable/debian/ jessie main'
- key_url: 'https://packagecloud.io/gpg.key'
\ No newline at end of file
+ key_url: 'https://packagecloud.io/gpg.key'
diff --git a/linux/system/repo_local/influxdb.yml b/linux/system/repo_local/influxdb.yml
index 7e3fb93..5e30d83 100644
--- a/linux/system/repo_local/influxdb.yml
+++ b/linux/system/repo_local/influxdb.yml
@@ -1,8 +1,8 @@
parameters:
linux:
system:
- repo:influxdb
- grafana:
+ repo:
+ influxdb:
refresh_db: ${_param:linux_repo_refresh_db}
source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly influxdb"
architectures: amd64
diff --git a/openssh/server/team/mcp_qa.yml b/openssh/server/team/mcp_qa.yml
new file mode 100644
index 0000000..eef4e3f
--- /dev/null
+++ b/openssh/server/team/mcp_qa.yml
@@ -0,0 +1,52 @@
+parameters:
+ linux:
+ system:
+ user:
+ ddmitriev:
+ enabled: true
+ name: ddmitriev
+ sudo: true
+ full_name: Denys Dmytriiev
+ home: /home/ddmitriev
+ dtyzhnenko:
+ enabled: true
+ name: dtyzhnenko
+ sudo: true
+ full_name: Dmitry Tyzhnenko
+ home: /home/dtyzhnenko
+ tleontovich:
+ enabled: true
+ name: tleontovich
+ sudo: true
+ full_name: Tatyanka Leontovich
+ home: /home/tleontovich
+ group:
+ libvirtd:
+ enabled: true
+ name: libvirtd
+ openssh:
+ server:
+ enabled: true
+ user:
+ ddmitriev:
+ enabled: true
+ public_keys:
+ - ${public_keys:ddmitriev}
+ user: ${linux:system:user:ddmitriev}
+ dtyzhnenko:
+ enabled: true
+ public_keys:
+ - ${public_keys:dtyzhnenko}
+ user: ${linux:system:user:dtyzhnenko}
+ tleontovich:
+ enabled: true
+ public_keys:
+ - ${public_keys:tleontovich}
+ user: ${linux:system:user:tleontovich}
+ public_keys:
+ ddmitriev:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuD4wJ8hzkchQ0pfgdwWukQyps1xYRfHOsjosmDu/mmgaXVud5mnpwb2q35E2YYTox2mx+ulJqyS+099gz6MPg4P8D5qdMuRbAsJqbceLaaIGQhdT8qgSo7ESrl5pwvYnfWzKLKF0z5s7nrW0nvArC40zhV9o9XpvzzzSFByepWfkwA8ReldGUYVvTKp8YXaCrqEdMZrU42adPM2nl+fYBbGF+h4/Ka247aVjPeER0blV3znFXbv2Kf38G+i/TEGaktgpBdtGGDi1tX2loMypmTJeqZRJnM0Eoly0BnynB7CSxn11eoIXBUe1mVYNqmQd1hw6uh59iymhK5j939v9J ddmitriev@dis_xcom
+ dtyzhnenko:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDhf5ysfuTmOO1975vUCag59tL+lQwfmWSQglZvKnMLnhO1P39VXDHCMla0Uh2IXI5abSrsq4xVXNfD3R5cnzPW8rG1h3528tSpszwZp28LSMkMfEZReEWVq2XoseRfzd7b3AaWN283NbQGPL6NRwyg9hLRG5dipdRxnDSutvDg/J4gbzeuS+QjXP6ymIs9vBhrpvHlQ6POI7Zedp2FOmqbGf3OK9wuBkD1Dhf+hTXvFSq1PFxmKB7w5CWvAOGGuapb+IYspPlDwd8lVWbvp+D3DchkhyL36gQyl2In/NKG2NR4z6dETX8JON5OMe0UipeKAsXInoVbyZfs3uZgdKDB dtyzhnenko
+ tleontovich:
+ key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLtOIkzqNA3wdLQyQxLRaRwi4oXnRCPCsrn8oaAyxDXHhU3+ATGvXBdbkA6xU3d4hAohru5DwxGzyikzAAtrv79GWA9/ryXPcplmxBiJcN36GyfW6eX89hI1VIJMKMG3cUs0ONf2D+hENhbaO0pu4hNAb5HFcHAuqecQNOFFrJ3RqnWM8RWgJPY3iF1A9JnXwVrUgME962VPlydYvlL5mLk+h+4DgHuPipw/Qana5a2JfdErsPYeAdDwG8frCdA9wvMzVVZv78s0lA6BritQdd0SyZejbOlT9KVHhSOhqnWdCtd8+nZXzXgjV7GAiv7H9yE4Ee6QYSHUQHwJxZs3ZT tleontovich@tleontovich-pc