| commit | 26542401745f5d990ac8277c0a762d8dc6c90260 | [log] [tgz] |
|---|---|---|
| author | Ales Komarek <akomarek@mirantis.com> | Thu Aug 31 12:03:25 2017 +0000 |
| committer | Gerrit Code Review <gerrit2@b3fef64565ee> | Thu Aug 31 12:03:27 2017 +0000 |
| tree | f4f3a295aa5f5e71ee03f17de42018811d84930e | |
| parent | 484e7c648d9f2ac89f31e3d0048a6f18f9bb5922 [diff] | |
| parent | 48812864ac6ce69d83209ff2554df2eb547b70dc [diff] |
Merge "Set designate to connect via rndc on localhost"
diff --git a/classes/cluster/virtual-mcp11-aio/infra/config.yml b/classes/cluster/virtual-mcp11-aio/infra/config.yml index 37f1323..ec91ce4 100644 --- a/classes/cluster/virtual-mcp11-aio/infra/config.yml +++ b/classes/cluster/virtual-mcp11-aio/infra/config.yml
@@ -3,7 +3,6 @@ parameters: _param: linux_system_codename: xenial - apt_mk_version: stable linux: system: name: cfg01
diff --git a/classes/cluster/virtual-mcp11-aio/infra/init.yml b/classes/cluster/virtual-mcp11-aio/infra/init.yml new file mode 100644 index 0000000..5bfe7c9 --- /dev/null +++ b/classes/cluster/virtual-mcp11-aio/infra/init.yml
@@ -0,0 +1,3 @@ +parameters: + _param: + apt_mk_version: stable \ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml index 3482262..86627d2 100755 --- a/classes/cluster/virtual-mcp11-aio/init.yml +++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -12,6 +12,7 @@ - system.mysql.client - system.memcached.server.single - system.rabbitmq.server.single +- cluster.virtual-mcp11-aio.infra - cluster.virtual-mcp11-aio.openstack - cluster.overrides parameters:
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml index 66ff1f0..f62dd25 100644 --- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml +++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -52,7 +52,7 @@ site: nginx_proxy_openstack_web: proxy: - host: prx + host: ${_param:openstack_control_address} nginx_proxy_openstack_api_heat_cfn: enabled: false salt: