summaryrefslogtreecommitdiffstats
path: root/openstack-ansible/file
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2017-03-14 18:08:27 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2017-08-11 12:56:12 -0700
commite6bfbe1e20142a14f2fac7c4f5f6d1261263994f (patch)
treef3a656787f6bc12b907967cbb9587106ef7c98de /openstack-ansible/file
parent9dcfd7fc3819de6218ac2c0a886c690e1281b8fb (diff)
prototypes: fix yamllint issues
Linting openstack-ansible files Change-Id: Id9e3ffa7753f25cd57c4d706b26cbb76d0bd99c7 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'openstack-ansible/file')
-rw-r--r--openstack-ansible/file/openstack_user_config.yml78
-rw-r--r--openstack-ansible/file/user_variables.yml10
2 files changed, 44 insertions, 44 deletions
diff --git a/openstack-ansible/file/openstack_user_config.yml b/openstack-ansible/file/openstack_user_config.yml
index 2811e62c..43e88c0d 100644
--- a/openstack-ansible/file/openstack_user_config.yml
+++ b/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/openstack-ansible/file/user_variables.yml b/openstack-ansible/file/user_variables.yml
index 3e14bc57..65cbcc11 100644
--- a/openstack-ansible/file/user_variables.yml
+++ b/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"