diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-21 15:11:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-21 15:11:32 +0000 |
| commit | 5e0fe095b0801dc7c053174ae34fd5d96e9ed503 (patch) | |
| tree | cfcd873f6fbfed932582f11338c96819be8edc63 | |
| parent | 43307904dde96ec802a9472b026b8b73da03f56d (diff) | |
| parent | a071bce07bad6722d961a2a6821655125a0886b5 (diff) | |
| download | kolla-5e0fe095b0801dc7c053174ae34fd5d96e9ed503.tar.gz kolla-5e0fe095b0801dc7c053174ae34fd5d96e9ed503.zip | |
Merge "Add "---" into some files of yaml"
| -rw-r--r-- | ansible/roles/glance/tasks/bootstrap_service.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/heat/tasks/bootstrap_service.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/ironic/tasks/bootstrap_service.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/kibana/tasks/pull.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/prechecks/vars/main.yml | 1 | ||||
| -rw-r--r-- | docker/bifrost/bifrost-base/build_arg.yml | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/ansible/roles/glance/tasks/bootstrap_service.yml b/ansible/roles/glance/tasks/bootstrap_service.yml index 0b3223446..decc23177 100644 --- a/ansible/roles/glance/tasks/bootstrap_service.yml +++ b/ansible/roles/glance/tasks/bootstrap_service.yml @@ -1,3 +1,4 @@ +--- - name: Running Glance bootstrap container kolla_docker: action: "start_container" diff --git a/ansible/roles/heat/tasks/bootstrap_service.yml b/ansible/roles/heat/tasks/bootstrap_service.yml index 58a571c67..f3d874c1a 100644 --- a/ansible/roles/heat/tasks/bootstrap_service.yml +++ b/ansible/roles/heat/tasks/bootstrap_service.yml @@ -1,3 +1,4 @@ +--- - name: Running Heat bootstrap container kolla_docker: action: "start_container" diff --git a/ansible/roles/ironic/tasks/bootstrap_service.yml b/ansible/roles/ironic/tasks/bootstrap_service.yml index 863bdc02d..986d1a657 100644 --- a/ansible/roles/ironic/tasks/bootstrap_service.yml +++ b/ansible/roles/ironic/tasks/bootstrap_service.yml @@ -1,3 +1,4 @@ +--- - name: Running Ironic bootstrap container kolla_docker: action: "start_container" diff --git a/ansible/roles/kibana/tasks/pull.yml b/ansible/roles/kibana/tasks/pull.yml index b97d0029d..afe39cd3e 100644 --- a/ansible/roles/kibana/tasks/pull.yml +++ b/ansible/roles/kibana/tasks/pull.yml @@ -1,3 +1,4 @@ +--- - name: Pulling Kibana image kolla_docker: action: "pull_image" diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index 1dff86596..fd2237209 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -1,3 +1,4 @@ +--- docker_version_min: '1.10.0' docker_py_version_min: '1.6.0' ansible_version_min: '2.0.0' diff --git a/docker/bifrost/bifrost-base/build_arg.yml b/docker/bifrost/bifrost-base/build_arg.yml index c069fc2a3..b1384f793 100644 --- a/docker/bifrost/bifrost-base/build_arg.yml +++ b/docker/bifrost/bifrost-base/build_arg.yml @@ -1,3 +1,4 @@ +--- skip_bootstrap: true skip_start: true install_dib: true |