diff options
Diffstat (limited to 'mcp/reclass/classes')
3 files changed, 20 insertions, 1 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml index e0f9a2a94..275941120 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/config.yml @@ -47,6 +47,15 @@ parameters: master: accept_policy: open_mode file_recv: true + environment: + prd: + formula: + maas: + # Temporary fixup for MaaS formula machine status int.lower() + version: 0.0.1+201711061044.9f1b034~xenial1 + neutron: + # Temporary fixup for mismatch between formula and reclass model + version: 2016.12.1+201709251458.f0607d9-1xenial1 reclass: storage: data_source: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml index d93d9ee5b..a2d39854e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml @@ -41,6 +41,7 @@ parameters: system: package: libapache2-mod-wsgi: + version: latest salt: minion: cert: @@ -49,7 +50,7 @@ parameters: key_usage: 'digitalSignature, keyEncipherment' apache: server: - modules: ~ + modules: '' horizon: server: bind: diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml index 3c3d5260a..21ed8d329 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml @@ -43,6 +43,15 @@ parameters: salt: master: file_recv: true + environment: + prd: + formula: + maas: + # Temporary fixup for MaaS formula machine status int.lower() + version: 0.0.1+201711061044.9f1b034~xenial1 + neutron: + # Temporary fixup for mismatch between formula and reclass model + version: 2016.12.1+201709251458.f0607d9-1xenial1 reclass: storage: data_source: |