Merge "Add missed , in alternative names for novncproxy_server"
diff --git a/docker/swarm/manager.yml b/docker/swarm/manager.yml
index a1eb8b7..3b2d916 100644
--- a/docker/swarm/manager.yml
+++ b/docker/swarm/manager.yml
@@ -15,8 +15,3 @@
options:
log-opts:
labels: "com.docker.stack.namespace,com.docker.swarm.service.name,com.docker.swarm.task.name"
- telegraf:
- agent:
- input:
- docker:
- gather_services: true
diff --git a/docker/swarm/master.yml b/docker/swarm/master.yml
index a51a5c4..d327796 100644
--- a/docker/swarm/master.yml
+++ b/docker/swarm/master.yml
@@ -11,8 +11,3 @@
options:
log-opts:
labels: "com.docker.stack.namespace,com.docker.swarm.service.name,com.docker.swarm.task.name"
- telegraf:
- agent:
- input:
- docker:
- gather_services: true
diff --git a/docker/swarm/worker.yml b/docker/swarm/worker.yml
index 6958efb..4bed790 100644
--- a/docker/swarm/worker.yml
+++ b/docker/swarm/worker.yml
@@ -11,8 +11,3 @@
master:
host: ${_param:cluster_node01_address}
port: ${_param:docker_swarm_master_port}
- telegraf:
- agent:
- input:
- docker:
- gather_services: true
diff --git a/keystone/server/cluster.yml b/keystone/server/cluster.yml
index 95884e7..d64a6cb 100644
--- a/keystone/server/cluster.yml
+++ b/keystone/server/cluster.yml
@@ -34,13 +34,14 @@
admin_password: ${_param:keystone_admin_password}
admin_email: ${_param:admin_email}
role: ${_param:openstack_node_role}
+ admin_region: ${_param:openstack_region}
+ region: ${_param:openstack_region}
bind:
address: ${_param:cluster_local_address}
private_address: ${_param:cluster_vip_address}
private_port: 35357
public_address: ${_param:cluster_vip_address}
public_port: 5000
- region: ${_param:openstack_region}
database:
engine: mysql
host: ${_param:openstack_database_address}
diff --git a/keystone/server/single.yml b/keystone/server/single.yml
index c792bf5..6996968 100644
--- a/keystone/server/single.yml
+++ b/keystone/server/single.yml
@@ -33,13 +33,14 @@
admin_password: ${_param:keystone_admin_password}
admin_email: ${_param:admin_email}
role: ${_param:openstack_node_role}
+ admin_region: ${_param:openstack_region}
+ region: ${_param:openstack_region}
bind:
address: ${_param:single_address}
private_address: ${_param:single_address}
private_port: 35357
public_address: ${_param:single_address}
public_port: 5000
- region: ${_param:openstack_region}
database:
engine: mysql
host: ${_param:single_address}
diff --git a/linux/network/hosts/openstack.yml b/linux/network/hosts/openstack.yml
index 1238d0a..7fd2e3e 100644
--- a/linux/network/hosts/openstack.yml
+++ b/linux/network/hosts/openstack.yml
@@ -6,4 +6,4 @@
address: ${_param:openstack_control_address}
names:
- ${_param:openstack_service_hostname}
- - ${_param:openstack_service_hos}
+ - ${_param:openstack_service_host}
diff --git a/openssh/server/team/k8s_team.yml b/openssh/server/team/k8s_team.yml
index 918a16a..daa2391 100644
--- a/openssh/server/team/k8s_team.yml
+++ b/openssh/server/team/k8s_team.yml
@@ -6,6 +6,7 @@
- system.openssh.server.team.members.ishvedunov
- system.openssh.server.team.members.jnowak
- system.openssh.server.team.members.loles
+- system.openssh.server.team.members.vryzhenkin
# Deprecated users
- system.openssh.server.team.members.deprecated.dshulyak
- system.openssh.server.team.members.deprecated.mattymo