diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-12-27 17:44:34 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2017-01-05 09:42:35 +0800 |
| commit | 92f6ca7bb6d7b2f295406aab34094b1dba76ff94 (patch) | |
| tree | c4e62927a3bf9862f7ba9ce286cbece2c4335ef4 /deploy/adapters/ansible/roles/keystone/tasks | |
| parent | 6072a49adb33f2bce3f48b9c7b8be7d96cf8501c (diff) | |
Yamllint test
JIRA: COMPASS-516
Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/keystone/tasks')
| -rw-r--r-- | deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml | 23 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/keystone/tasks/keystone_create.yml | 22 |
2 files changed, 24 insertions, 21 deletions
diff --git a/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml b/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml index 33892c5f..ac3ff8fe 100644 --- a/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml +++ b/deploy/adapters/ansible/roles/keystone/tasks/keystone_config.yml @@ -36,11 +36,12 @@ - restart keystone services - name: Distribute the fernet key repository - shell: rsync -e 'ssh -o StrictHostKeyChecking=no' \ - -avz \ - --delete \ - /etc/keystone/fernet-keys \ - root@{{ hostvars[ item ].ansible_eth0.ipv4.address }}:/etc/keystone/ + shell: | + rsync -e 'ssh -o StrictHostKeyChecking=no' \ + -avz \ + --delete \ + /etc/keystone/fernet-keys \ + root@{{ hostvars[ item ].ansible_eth0.ipv4.address }}:/etc/keystone/ with_items: "{{ groups['controller'][1:] }}" notify: - restart keystone services @@ -69,11 +70,12 @@ - restart keystone services - name: Distribute the credential key repository - shell: rsync -e 'ssh -o StrictHostKeyChecking=no' \ - -avz \ - --delete \ - /etc/keystone/credential-keys \ - root@{{ hostvars[ item ].ansible_eth0.ipv4.address }}:/etc/keystone/ + shell: | + rsync -e 'ssh -o StrictHostKeyChecking=no' \ + -avz \ + --delete \ + /etc/keystone/credential-keys \ + root@{{ hostvars[ item ].ansible_eth0.ipv4.address }}:/etc/keystone/ with_items: "{{ groups['controller'][1:] }}" notify: - restart keystone services @@ -93,4 +95,3 @@ - name: wait for keystone ready wait_for: port=35357 delay=15 timeout=60 host={{ internal_ip }} - diff --git a/deploy/adapters/ansible/roles/keystone/tasks/keystone_create.yml b/deploy/adapters/ansible/roles/keystone/tasks/keystone_create.yml index ab71fab4..2f5aefeb 100644 --- a/deploy/adapters/ansible/roles/keystone/tasks/keystone_create.yml +++ b/deploy/adapters/ansible/roles/keystone/tasks/keystone_create.yml @@ -11,17 +11,20 @@ shell: . /opt/admin-openrc.sh; openstack endpoint set \ - --interface public \ - --url {{ item.publicurl }} \ - $(openstack endpoint list | grep keystone | grep public | awk '{print $2}'); + --interface public \ + --url {{ item.publicurl }} \ + $(openstack endpoint list | grep keystone | grep public \ + | awk '{print $2}'); openstack endpoint set \ - --interface internal \ - --url {{ item.internalurl }} \ - $(openstack endpoint list | grep keystone | grep internal | awk '{print $2}'); + --interface internal \ + --url {{ item.internalurl }} \ + $(openstack endpoint list | grep keystone | grep internal \ + | awk '{print $2}'); openstack endpoint set \ - --interface admin \ - --url {{ item.adminurl }} \ - $(openstack endpoint list | grep keystone | grep admin | awk '{print $2}'); + --interface admin \ + --url {{ item.adminurl }} \ + $(openstack endpoint list | grep keystone | grep admin \ + | awk '{print $2}'); with_items: "{{ os_services[0:1] }}" register: result until: result.rc == 0 @@ -123,4 +126,3 @@ until: result.rc == 0 retries: 10 delay: 5 - |