diff options
| author |   liyuenan <liyuenan@huawei.com> | 2017-01-18 18:05:27 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2017-01-25 12:37:20 +0800 |
| commit | 7173757a6190f4528d36053d82467c74dbf16b3f (patch) | |
| tree | bfed2b845188bf51891f6397b3fbd3afbd566fea /deploy/adapters/ansible/roles/openstack-post | |
| parent | d001a27936a5d55cda2d8ca0849f30a8bd1c0b3d (diff) | |
Ansible Module substitute for Shell Commands
JIRA: COMPASS-520
After update ansible version to v3, keystone_user module only support v2 API.
So we use Shell Commands now, but it will failed with high probability.
Those Shell Commands should be instead by ansible modules to manage Identity users,
projects or some other work like crate networks.
Change-Id: I63d38b4a811a9c063ac4404da72787f594411b53
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/openstack-post')
| -rw-r--r-- | deploy/adapters/ansible/roles/openstack-post/tasks/main.yml | 24 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/openstack-post/vars/main.yml | 45 |
2 files changed, 54 insertions, 15 deletions
diff --git a/deploy/adapters/ansible/roles/openstack-post/tasks/main.yml b/deploy/adapters/ansible/roles/openstack-post/tasks/main.yml index 84b1260a..882f4884 100644 --- a/deploy/adapters/ansible/roles/openstack-post/tasks/main.yml +++ b/deploy/adapters/ansible/roles/openstack-post/tasks/main.yml @@ -7,20 +7,14 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- - - name: create openstack flavors - shell: | - . /opt/admin-openrc.sh; - openstack flavor show m1.nano || openstack flavor create \ - --id 0 --vcpus 1 --ram 64 --disk 1 m1.nano - openstack flavor show m1.tiny || openstack flavor create \ - --id 1 --vcpus 1 --ram 512 --disk 1 m1.tiny - openstack flavor show m1.small || openstack flavor create \ - --id 2 --vcpus 1 --ram 2048 --disk 20 m1.small - openstack flavor show m1.medium || openstack flavor create \ - --id 3 --vcpus 2 --ram 4096 --disk 40 m1.medium - openstack flavor show m1.large || openstack flavor create \ - --id 4 --vcpus 4 --ram 8192 --disk 80 m1.large - openstack flavor show m1.xlarge || openstack flavor create \ - --id 5 --vcpus 8 --ram 16384 --disk 160 m1.xlarge + os_nova_flavor: + cloud: opnfv + state: present + flavorid: "{{ item.id }}" + name: "{{ item.name }}" + vcpus: "{{ item.vcpus }}" + ram: "{{ item.ram }}" + disk: "{{ item.disk }}" + with_items: "{{ flavors }}" when: inventory_hostname == groups['controller'][0] diff --git a/deploy/adapters/ansible/roles/openstack-post/vars/main.yml b/deploy/adapters/ansible/roles/openstack-post/vars/main.yml new file mode 100644 index 00000000..d9c36d42 --- /dev/null +++ b/deploy/adapters/ansible/roles/openstack-post/vars/main.yml @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +flavors: + - id: 0 + name: m1.nano + vcpus: 1 + ram: 64 + disk: 1 + + - id: 1 + name: m1.tiny + vcpus: 1 + ram: 512 + disk: 1 + + - id: 2 + name: m1.small + vcpus: 1 + ram: 2048 + disk: 20 + + - id: 3 + name: m1.medium + vcpus: 2 + ram: 4096 + disk: 40 + + - id: 4 + name: m1.large + vcpus: 4 + ram: 8192 + disk: 80 + + - id: 5 + name: m1.xlarge + vcpus: 8 + ram: 16384 + disk: 160 |