summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Li <matthew.lijun@huawei.com>2017-03-21 02:00:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-21 02:00:23 +0000
commit054bbbde0e367c88af8b8f3b0c4d85d019dc7d67 (patch)
tree398b0a4d521544646e5cbd6f38c826ab9f6b9583
parenta50c482ac46d62e5a7c5c06915e3b3d1014747ff (diff)
parent6617ea710dd4fbfa2ef39cb184a5f36f61d36ffd (diff)
Merge "prototypes: fix yamllint issues"
-rw-r--r--prototypes/openstack-ansible/file/openstack_user_config.yml78
-rw-r--r--prototypes/openstack-ansible/file/user_variables.yml10
-rw-r--r--prototypes/openstack-ansible/playbooks/jumphost_configuration.yml80
-rw-r--r--prototypes/openstack-ansible/playbooks/targethost_configuration.yml60
4 files changed, 114 insertions, 114 deletions
diff --git a/prototypes/openstack-ansible/file/openstack_user_config.yml b/prototypes/openstack-ansible/file/openstack_user_config.yml
index 2811e62ce..43e88c0d0 100644
--- a/prototypes/openstack-ansible/file/openstack_user_config.yml
+++ b/prototypes/openstack-ansible/file/openstack_user_config.yml
@@ -67,9 +67,9 @@ global_overrides:
- cinder_volume
- nova_compute
-###
-### Infrastructure
-###
+# ##
+# ## Infrastructure
+# ##
# galera, memcache, rabbitmq, utility
shared-infra_hosts:
@@ -101,13 +101,13 @@ haproxy_hosts:
ip: 172.29.236.13
# rsyslog server
-#log_hosts:
- # log1:
- # ip: 172.29.236.14
+# log_hosts:
+# log1:
+# ip: 172.29.236.14
-###
-### OpenStack
-###
+# ##
+# ## OpenStack
+# ##
# keystone
identity_hosts:
@@ -133,36 +133,36 @@ storage-infra_hosts:
# user_variables, but are left here to illustrate that
# each container could have different storage targets.
image_hosts:
- controller00:
- ip: 172.29.236.11
- container_vars:
- limit_container_types: glance
- glance_nfs_client:
- - server: "172.29.244.15"
- remote_path: "/images"
- local_path: "/var/lib/glance/images"
- type: "nfs"
- options: "_netdev,auto"
- controller01:
- ip: 172.29.236.12
- container_vars:
- limit_container_types: glance
- glance_nfs_client:
- - server: "172.29.244.15"
- remote_path: "/images"
- local_path: "/var/lib/glance/images"
- type: "nfs"
- options: "_netdev,auto"
- controller02:
- ip: 172.29.236.13
- container_vars:
- limit_container_types: glance
- glance_nfs_client:
- - server: "172.29.244.15"
- remote_path: "/images"
- local_path: "/var/lib/glance/images"
- type: "nfs"
- options: "_netdev,auto"
+ controller00:
+ ip: 172.29.236.11
+ container_vars:
+ limit_container_types: glance
+ glance_nfs_client:
+ - server: "172.29.244.15"
+ remote_path: "/images"
+ local_path: "/var/lib/glance/images"
+ type: "nfs"
+ options: "_netdev,auto"
+ controller01:
+ ip: 172.29.236.12
+ container_vars:
+ limit_container_types: glance
+ glance_nfs_client:
+ - server: "172.29.244.15"
+ remote_path: "/images"
+ local_path: "/var/lib/glance/images"
+ type: "nfs"
+ options: "_netdev,auto"
+ controller02:
+ ip: 172.29.236.13
+ container_vars:
+ limit_container_types: glance
+ glance_nfs_client:
+ - server: "172.29.244.15"
+ remote_path: "/images"
+ local_path: "/var/lib/glance/images"
+ type: "nfs"
+ options: "_netdev,auto"
# nova api, conductor, etc services
compute-infra_hosts:
diff --git a/prototypes/openstack-ansible/file/user_variables.yml b/prototypes/openstack-ansible/file/user_variables.yml
index 3e14bc57e..65cbcc11b 100644
--- a/prototypes/openstack-ansible/file/user_variables.yml
+++ b/prototypes/openstack-ansible/file/user_variables.yml
@@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-###
-### This file contains commonly used overrides for convenience. Please inspect
-### the defaults for each role to find additional override options.
-###
+# ##
+# ## This file contains commonly used overrides for convenience. Please inspect
+# ## the defaults for each role to find additional override options.
+# ##
-## Debug and Verbose options.
+# # Debug and Verbose options.
debug: false
haproxy_keepalived_external_vip_cidr: "192.168.122.220/32"
diff --git a/prototypes/openstack-ansible/playbooks/jumphost_configuration.yml b/prototypes/openstack-ansible/playbooks/jumphost_configuration.yml
index c51d83073..74e97cdd5 100644
--- a/prototypes/openstack-ansible/playbooks/jumphost_configuration.yml
+++ b/prototypes/openstack-ansible/playbooks/jumphost_configuration.yml
@@ -4,44 +4,44 @@
vars_files:
- ../var/ubuntu.yml
tasks:
- - name: generate SSH keys
- shell: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N ""
- args:
- creates: /root/.ssh/id_rsa
- - name: fetch public key
- fetch: src="/root/.ssh/id_rsa.pub" dest="/"
- - name: remove the directory
- shell: "rm -rf {{OSA_PATH}} {{OSA_ETC_PATH}}"
- - name: git openstack ansible
- shell: "git clone {{OSA_URL}} {{OSA_PATH}} -b {{OSA_BRANCH}}"
- - name: copy /opt/openstack-ansible/etc/openstack_deploy to /etc/openstack_deploy
- shell: "/bin/cp -rf {{OSA_PATH}}/etc/openstack_deploy {{OSA_ETC_PATH}}"
- - name: bootstrap
- command: "/bin/bash ./scripts/bootstrap-ansible.sh"
- args:
- chdir: "{{OSA_PATH}}"
- - name: generate password token
- command: "python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml"
- args:
- chdir: /opt/openstack-ansible/scripts/
- - name: copy openstack_user_config.yml to /etc/openstack_deploy
- copy:
- src: ../file/openstack_user_config.yml
- dest: "{{OSA_ETC_PATH}}/openstack_user_config.yml"
- - name: copy cinder.yml to /etc/openstack_deploy/env.d
- copy:
- src: ../file/cinder.yml
- dest: "{{OSA_ETC_PATH}}/env.d/cinder.yml"
- - name: copy user_variables.yml to /etc/openstack_deploy/
- copy:
- src: ../file/user_variables.yml
- dest: "{{OSA_ETC_PATH}}/user_variables.yml"
- - name: configure network
- template:
- src: ../template/bifrost/controller.interface.j2
- dest: /etc/network/interfaces
- notify:
- - restart network service
+ - name: generate SSH keys
+ shell: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N ""
+ args:
+ creates: /root/.ssh/id_rsa
+ - name: fetch public key
+ fetch: src="/root/.ssh/id_rsa.pub" dest="/"
+ - name: remove the directory
+ shell: "rm -rf {{OSA_PATH}} {{OSA_ETC_PATH}}"
+ - name: git openstack ansible
+ shell: "git clone {{OSA_URL}} {{OSA_PATH}} -b {{OSA_BRANCH}}"
+ - name: copy /opt/openstack-ansible/etc/openstack_deploy to /etc/openstack_deploy
+ shell: "/bin/cp -rf {{OSA_PATH}}/etc/openstack_deploy {{OSA_ETC_PATH}}"
+ - name: bootstrap
+ command: "/bin/bash ./scripts/bootstrap-ansible.sh"
+ args:
+ chdir: "{{OSA_PATH}}"
+ - name: generate password token
+ command: "python pw-token-gen.py --file /etc/openstack_deploy/user_secrets.yml"
+ args:
+ chdir: /opt/openstack-ansible/scripts/
+ - name: copy openstack_user_config.yml to /etc/openstack_deploy
+ copy:
+ src: ../file/openstack_user_config.yml
+ dest: "{{OSA_ETC_PATH}}/openstack_user_config.yml"
+ - name: copy cinder.yml to /etc/openstack_deploy/env.d
+ copy:
+ src: ../file/cinder.yml
+ dest: "{{OSA_ETC_PATH}}/env.d/cinder.yml"
+ - name: copy user_variables.yml to /etc/openstack_deploy/
+ copy:
+ src: ../file/user_variables.yml
+ dest: "{{OSA_ETC_PATH}}/user_variables.yml"
+ - name: configure network
+ template:
+ src: ../template/bifrost/controller.interface.j2
+ dest: /etc/network/interfaces
+ notify:
+ - restart network service
handlers:
- name: restart network service
shell: "/sbin/ifconfig ens3 0 &&/sbin/ifdown -a && /sbin/ifup -a"
@@ -49,5 +49,5 @@
- hosts: localhost
remote_user: root
tasks:
- - name: Generate authorized_keys
- shell: "/bin/cat /jumphost/root/.ssh/id_rsa.pub >> ../file/authorized_keys"
+ - name: Generate authorized_keys
+ shell: "/bin/cat /jumphost/root/.ssh/id_rsa.pub >> ../file/authorized_keys"
diff --git a/prototypes/openstack-ansible/playbooks/targethost_configuration.yml b/prototypes/openstack-ansible/playbooks/targethost_configuration.yml
index ffe788f0e..1f4ad063e 100644
--- a/prototypes/openstack-ansible/playbooks/targethost_configuration.yml
+++ b/prototypes/openstack-ansible/playbooks/targethost_configuration.yml
@@ -4,26 +4,26 @@
vars_files:
- ../var/ubuntu.yml
tasks:
- - name: add public key to host
- copy:
- src: ../file/authorized_keys
- dest: /root/.ssh/authorized_keys
- - name: configure modules
- copy:
- src: ../file/modules
- dest: /etc/modules
+ - name: add public key to host
+ copy:
+ src: ../file/authorized_keys
+ dest: /root/.ssh/authorized_keys
+ - name: configure modules
+ copy:
+ src: ../file/modules
+ dest: /etc/modules
- hosts: controller
remote_user: root
vars_files:
- ../var/ubuntu.yml
tasks:
- - name: configure network
- template:
- src: ../template/bifrost/controller.interface.j2
- dest: /etc/network/interfaces
- notify:
- - restart network service
+ - name: configure network
+ template:
+ src: ../template/bifrost/controller.interface.j2
+ dest: /etc/network/interfaces
+ notify:
+ - restart network service
handlers:
- name: restart network service
shell: "/sbin/ifconfig ens3 0 &&/sbin/ifdown -a && /sbin/ifup -a"
@@ -33,12 +33,12 @@
vars_files:
- ../var/ubuntu.yml
tasks:
- - name: configure network
- template:
- src: ../template/bifrost/compute.interface.j2
- dest: /etc/network/interfaces
- notify:
- - restart network service
+ - name: configure network
+ template:
+ src: ../template/bifrost/compute.interface.j2
+ dest: /etc/network/interfaces
+ notify:
+ - restart network service
handlers:
- name: restart network service
shell: "/sbin/ifconfig ens3 0 &&/sbin/ifdown -a && /sbin/ifup -a"
@@ -46,16 +46,16 @@
- hosts: compute01
remote_user: root
tasks:
- - name: make nfs dir
- file: "dest=/images mode=777 state=directory"
- - name: configure sdrvice
- shell: "echo 'nfs 2049/tcp' >> /etc/services && echo 'nfs 2049/udp' >> /etc/services"
- - name: configure NFS
- copy:
- src: ../file/exports
- dest: /etc/exports
- notify:
- - restart nfs service
+ - name: make nfs dir
+ file: "dest=/images mode=777 state=directory"
+ - name: configure sdrvice
+ shell: "echo 'nfs 2049/tcp' >> /etc/services && echo 'nfs 2049/udp' >> /etc/services"
+ - name: configure NFS
+ copy:
+ src: ../file/exports
+ dest: /etc/exports
+ notify:
+ - restart nfs service
handlers:
- name: restart nfs service
service: name=nfs-kernel-server state=restarted