diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2017-03-21 01:58:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-21 01:58:25 +0000 |
| commit | a50c482ac46d62e5a7c5c06915e3b3d1014747ff (patch) | |
| tree | 0f62fa60d8069b4f2e2425b8981e814a8ae5ec41 | |
| parent | 238dcd4b145e15b0e8e41575e6d83e086adca848 (diff) | |
| parent | 2540e27a611794078975c35a2041df80724a9008 (diff) | |
Merge "prototypes: fix yamllint issues"
| -rw-r--r-- | prototypes/puppet-infracloud/creds/clouds.yaml | 1 | ||||
| -rw-r--r-- | prototypes/puppet-infracloud/hiera/common.yaml | 1 | ||||
| -rw-r--r-- | prototypes/puppet-infracloud/hiera/common_baremetal.yaml | 9 |
3 files changed, 7 insertions, 4 deletions
diff --git a/prototypes/puppet-infracloud/creds/clouds.yaml b/prototypes/puppet-infracloud/creds/clouds.yaml index eb44db66c..cc27da28a 100644 --- a/prototypes/puppet-infracloud/creds/clouds.yaml +++ b/prototypes/puppet-infracloud/creds/clouds.yaml @@ -1,3 +1,4 @@ +--- clouds: opnfv: verify: False diff --git a/prototypes/puppet-infracloud/hiera/common.yaml b/prototypes/puppet-infracloud/hiera/common.yaml index 1943f660b..634d96cb5 100644 --- a/prototypes/puppet-infracloud/hiera/common.yaml +++ b/prototypes/puppet-infracloud/hiera/common.yaml @@ -1,3 +1,4 @@ +--- keystone_rabbit_password: pass neutron_rabbit_password: pass nova_rabbit_password: pass diff --git a/prototypes/puppet-infracloud/hiera/common_baremetal.yaml b/prototypes/puppet-infracloud/hiera/common_baremetal.yaml index a8d69a05d..015612c99 100644 --- a/prototypes/puppet-infracloud/hiera/common_baremetal.yaml +++ b/prototypes/puppet-infracloud/hiera/common_baremetal.yaml @@ -1,3 +1,4 @@ +--- keystone_rabbit_password: pass neutron_rabbit_password: pass nova_rabbit_password: pass @@ -134,8 +135,8 @@ ironic_inventory: ipv4_subnet_mask: 255.255.255.192 name: controller00.opnfvlocal nics: - - mac: a4:bf:01:01:a9:fc - - mac: 00:1e:67:f6:9b:35 + - mac: a4:bf:01:01:a9:fc + - mac: 00:1e:67:f6:9b:35 properties: cpu_arch: x86_64 cpus: '44' @@ -156,8 +157,8 @@ ironic_inventory: ipv4_subnet_mask: 255.255.255.0 name: compute00.opnfvlocal nics: - - mac: a4:bf:01:01:a9:d4 - - mac: 00:1e:67:f6:9b:37 + - mac: a4:bf:01:01:a9:d4 + - mac: 00:1e:67:f6:9b:37 properties: cpu_arch: x86_64 cpus: '44' |