diff options
Diffstat (limited to 'deploy/adapters/ansible/openstack')
| -rw-r--r-- | deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml | 36 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack/allinone.yml | 8 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack/compute.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack/controller.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack/multinodes.yml | 24 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack/network.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack/single-controller.yml | 10 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack/storage.yml | 2 |
8 files changed, 41 insertions, 45 deletions
diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index 4e85568c..ef833224 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -27,14 +27,19 @@ group: root - name: generate ssh keys - shell: if [ ! -f ~/.ssh/id_rsa.pub ]; then ssh-keygen -q -t rsa -f ~/.ssh/id_rsa -N ""; else echo "already gen ssh key!"; fi; + shell: if [ ! -f ~/.ssh/id_rsa.pub ]; \ + then ssh-keygen -q -t rsa -f ~/.ssh/id_rsa -N ""; \ + else echo "already gen ssh key!"; fi; - name: fetch ssh keys - fetch: src=/root/.ssh/id_rsa.pub dest=/tmp/ssh-keys-{{ ansible_hostname }} flat=yes + fetch: + src: /root/.ssh/id_rsa.pub + dest: /tmp/ssh-keys-{{ ansible_hostname }} + flat: "yes" - authorized_key: user: root - key: "{{ lookup('file', item) }}" + key: "{{ lookup('file', item) }}" with_fileglob: - /tmp/ssh-keys-* max_fail_percentage: 0 @@ -88,10 +93,10 @@ - cinder-volume - ceilometer_compute -#- hosts: all -# remote_user: root -## max_fail_percentage: 0 -# roles: +- hosts: all + remote_user: root + max_fail_percentage: 0 + roles: [] # - moon - hosts: all @@ -104,7 +109,7 @@ remote_user: root max_fail_percentage: 0 roles: [] - # - ceph-deploy +# - ceph-deploy - hosts: ceph remote_user: root @@ -144,8 +149,8 @@ tasks: - name: set bash to nova user: - name: nova - shell: /bin/bash + name: nova + shell: /bin/bash - name: make sure ssh dir exist file: @@ -176,14 +181,13 @@ - authorized_key: user: nova - key: "{{ lookup('file', item) }}" + key: "{{ lookup('file', item) }}" with_fileglob: - /tmp/ssh-keys-* - name: chown ssh file shell: chown -R nova:nova /var/lib/nova/.ssh; - - hosts: all remote_user: root max_fail_percentage: 0 @@ -198,13 +202,6 @@ - hosts: all remote_user: root - sudo: True - max_fail_percentage: 0 - roles: - - open-contrail - -- hosts: all - remote_user: root serial: 1 max_fail_percentage: 0 roles: @@ -239,4 +236,3 @@ max_fail_percentage: 0 roles: - compute-recovery - diff --git a/deploy/adapters/ansible/openstack/allinone.yml b/deploy/adapters/ansible/openstack/allinone.yml index fabc6eb4..e8597434 100644 --- a/deploy/adapters/ansible/openstack/allinone.yml +++ b/deploy/adapters/ansible/openstack/allinone.yml @@ -1,6 +1,6 @@ --- - hosts: controller - sudo: True + sudo: "True" roles: - common - kvmfornfv @@ -14,19 +14,19 @@ - glance - hosts: network - sudo: True + sudo: "True" roles: - common - neutron-network - hosts: storage - sudo: True + sudo: "True" roles: - common - cinder-volume - hosts: compute - sudo: True + sudo: "True" roles: - common - nova-compute diff --git a/deploy/adapters/ansible/openstack/compute.yml b/deploy/adapters/ansible/openstack/compute.yml index d0c41c3e..7a1488f3 100644 --- a/deploy/adapters/ansible/openstack/compute.yml +++ b/deploy/adapters/ansible/openstack/compute.yml @@ -1,7 +1,7 @@ --- - hosts: all remote_user: vagrant - sudo: True + sudo: "True" roles: - common - kvmfornfv diff --git a/deploy/adapters/ansible/openstack/controller.yml b/deploy/adapters/ansible/openstack/controller.yml index 0269281e..e6c52733 100644 --- a/deploy/adapters/ansible/openstack/controller.yml +++ b/deploy/adapters/ansible/openstack/controller.yml @@ -1,7 +1,7 @@ --- - hosts: controller remote_user: root - sudo: True + sudo: "True" roles: - common - database diff --git a/deploy/adapters/ansible/openstack/multinodes.yml b/deploy/adapters/ansible/openstack/multinodes.yml index 5b43a696..4bd22936 100644 --- a/deploy/adapters/ansible/openstack/multinodes.yml +++ b/deploy/adapters/ansible/openstack/multinodes.yml @@ -1,66 +1,66 @@ --- - hosts: database - sudo: True + sudo: "True" roles: - common - database - hosts: messaging - sudo: True + sudo: "True" roles: - common - mq - hosts: identity - sudo: True + sudo: "True" roles: - common - keystone - hosts: compute-controller - sudo: True + sudo: "True" roles: - common - nova-controller - hosts: network-server - sudo: True + sudo: "True" roles: - common - neutron-controller - hosts: storage-controller - sudo: True + sudo: "True" roles: - common - cinder-controller - hosts: image - sudo: True + sudo: "True" roles: - common - glance - hosts: dashboard - sudo: True + sudo: "True" roles: - common - dashboard - hosts: network-worker - sudo: True + sudo: "True" roles: - common - neutron-network - hosts: storage-volume - sudo: True + sudo: "True" roles: - common - cinder-volume - hosts: compute-worker - sudo: True + sudo: "True" roles: - common - nova-compute @@ -68,6 +68,6 @@ - hosts: odl remote_user: root - sudo: True + sudo: "True" roles: - odl diff --git a/deploy/adapters/ansible/openstack/network.yml b/deploy/adapters/ansible/openstack/network.yml index 77752e45..8e4ec439 100644 --- a/deploy/adapters/ansible/openstack/network.yml +++ b/deploy/adapters/ansible/openstack/network.yml @@ -1,7 +1,7 @@ --- - hosts: all remote_user: vagrant - sudo: True + sudo: "True" roles: - common - neutron-network diff --git a/deploy/adapters/ansible/openstack/single-controller.yml b/deploy/adapters/ansible/openstack/single-controller.yml index 96ec0a6a..e7f6900d 100644 --- a/deploy/adapters/ansible/openstack/single-controller.yml +++ b/deploy/adapters/ansible/openstack/single-controller.yml @@ -1,6 +1,6 @@ --- - hosts: controller - sudo: True + sudo: "True" roles: - common - database @@ -13,19 +13,19 @@ - glance - hosts: network - sudo: True + sudo: "True" roles: - common - neutron-network - hosts: storage - sudo: True + sudo: "True" roles: - common - cinder-volume - hosts: compute - sudo: True + sudo: "True" roles: - common - nova-compute @@ -33,6 +33,6 @@ - hosts: odl remote_user: root - sudo: True + sudo: "True" roles: - odl diff --git a/deploy/adapters/ansible/openstack/storage.yml b/deploy/adapters/ansible/openstack/storage.yml index f0be1381..6a6bd34c 100644 --- a/deploy/adapters/ansible/openstack/storage.yml +++ b/deploy/adapters/ansible/openstack/storage.yml @@ -1,7 +1,7 @@ --- - hosts: all remote_user: vagrant - sudo: True + sudo: "True" roles: - common - cinder-volume |