diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-11 17:08:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-11 17:08:54 +0000 |
| commit | c2269d2ed4f55ec051c058dc6b733f74d0d3eec3 (patch) | |
| tree | e0feffad9efc149dd1382988a5267f43c83293bd /mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra | |
| parent | 89bb73f0fba7d09591f52f5a513d1a846c373a8b (diff) | |
| parent | 0546e310ce230a46dcf3a3795c6a0baefd7aaaf2 (diff) | |
Merge changes from topic 'multiarch-image-defaults'
* changes:
reclass: virtual: Factor out VM interface naming
reclass: Multiarch support for arch specific param
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml index 0baebb65e..f1769d714 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -54,7 +54,6 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 - salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2 salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/" linux: system: |