diff --git a/ansible/roles/baremetal/tasks/post-install.yml b/ansible/roles/baremetal/tasks/post-install.yml index b5b88cae9e023167ebc6c0033438f12f5b9f987b..146f4835e1f3957679f177ec2d7dd789383df1ed 100644 --- a/ansible/roles/baremetal/tasks/post-install.yml +++ b/ansible/roles/baremetal/tasks/post-install.yml @@ -1,5 +1,4 @@ --- - - name: Ensure docker service directory exists file: path=/etc/systemd/system/docker.service.d diff --git a/ansible/roles/bifrost/tasks/config.yml b/ansible/roles/bifrost/tasks/config.yml index 14bcbb267f59c82ea80eeae77dc156266a2923b6..5f99372b0429ec82d103e50d7ead067e10502bb5 100644 --- a/ansible/roles/bifrost/tasks/config.yml +++ b/ansible/roles/bifrost/tasks/config.yml @@ -27,4 +27,3 @@ - { src: "id_rsa", dest: "id_rsa" } - { src: "id_rsa.pub", dest: "id_rsa.pub" } - { src: "ssh_config", dest: "ssh_config" } - diff --git a/ansible/roles/bifrost/tasks/deploy-servers.yml b/ansible/roles/bifrost/tasks/deploy-servers.yml index 6a6a990eb5e9159aeebbfac63c7b59593b52ebe3..7c99a24b359a14fac88651ee049bca4a13a20402 100644 --- a/ansible/roles/bifrost/tasks/deploy-servers.yml +++ b/ansible/roles/bifrost/tasks/deploy-servers.yml @@ -18,4 +18,3 @@ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/bifrost_inventory.py /bifrost/playbooks/deploy-dynamic.yaml -e "ansible_python_interpreter=/var/lib/kolla/venv/bin/python" -e @/etc/bifrost/bifrost.yml' - diff --git a/ansible/roles/bifrost/tasks/deploy.yml b/ansible/roles/bifrost/tasks/deploy.yml index c1a47564f0a4c71fdc13f53842557eeca97fde51..1129e90b88ca9e2509f47887ede41dbbd646a5d7 100644 --- a/ansible/roles/bifrost/tasks/deploy.yml +++ b/ansible/roles/bifrost/tasks/deploy.yml @@ -2,4 +2,3 @@ - include: config.yml - include: start.yml - include: bootstrap.yml - diff --git a/ansible/roles/bifrost/tasks/start.yml b/ansible/roles/bifrost/tasks/start.yml index 251ceb94cdb737588f7c2a88bb5ae93a124445d0..58b247b665386b01c1286defc3ea5fade6122608 100644 --- a/ansible/roles/bifrost/tasks/start.yml +++ b/ansible/roles/bifrost/tasks/start.yml @@ -10,4 +10,3 @@ - "{{ node_config_directory }}/bifrost/:/etc/bifrost:ro" - "/etc/localtime:/etc/localtime:ro" - "/dev:/dev" - diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index ae8526ee0528cdc2bfc6d44f144e26a9965d0737..4746f34ba65e264b9e319a1f344fd55b14983cfb 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2 @@ -596,4 +596,3 @@ listen mariadb {% endfor %} {% endif %} - diff --git a/ansible/roles/mongodb/defaults/main.yml b/ansible/roles/mongodb/defaults/main.yml index d57ce5f20bc245b5884871faea7b383a9ed54233..9bf44a58310f33c1b54bf5b45834fc738cc4a648 100644 --- a/ansible/roles/mongodb/defaults/main.yml +++ b/ansible/roles/mongodb/defaults/main.yml @@ -13,5 +13,4 @@ mongodb_image_full: "{{ mongodb_image }}:{{ mongodb_tag }}" #################### # Mongodb #################### - mongodb_replication_set_name: "rs0" diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 82c991e94f8213b1386396dda0b2d180419d9451..c1e8cd3a0a4ab450399eff3a0831d6dd3c313db6 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -182,7 +182,6 @@ rbd_secret_uuid = {{ rbd_secret_uuid }} {% endif %} - [upgrade_levels] compute = auto diff --git a/docker/grafana/extend_start.sh b/docker/grafana/extend_start.sh index 22f57a6566371b0fd5363b150392915cb03e81bb..5ed4dc56d75b7966805b9aa220d90534be960660 100644 --- a/docker/grafana/extend_start.sh +++ b/docker/grafana/extend_start.sh @@ -6,4 +6,3 @@ fi if [[ $(stat -c %a /var/log/kolla/grafana) != "755" ]]; then chmod 755 /var/log/kolla/grafana fi - diff --git a/docker/grafana/grafana_sudoers b/docker/grafana/grafana_sudoers index 98af2f54eb000b8f21da52e125b972ce34bbc273..386829969a6eb7fc15d6fa9b6540bb40b1f49e76 100644 --- a/docker/grafana/grafana_sudoers +++ b/docker/grafana/grafana_sudoers @@ -1,2 +1 @@ - %kolla ALL=(root) NOPASSWD: /usr/bin/chown -R grafana\: /var/lib/grafana/, /bin/chown -R grafana\: /var/lib/grafana/