Fix example tests
diff --git "a/\173\173cookiecutter.project_name\175\175/tests/pillar/compute_cluster.sls" "b/\173\173cookiecutter.project_name\175\175/tests/pillar/compute_cluster.sls"
deleted file mode 100644
index 6f03b6e..0000000
--- "a/\173\173cookiecutter.project_name\175\175/tests/pillar/compute_cluster.sls"
+++ /dev/null
@@ -1,49 +0,0 @@
-nova:
- compute:
- version: liberty
- enabled: true
- virtualization: kvm
- heal_instance_info_cache_interval: 60
- vncproxy_url: openstack:6080
- bind:
- vnc_address: 127.0.0.1
- vnc_port: 6080
- vnc_name: 0.0.0.0
- database:
- engine: mysql
- host: 127.0.0.1
- port: 3306
- name: nova
- user: nova
- password: password
- identity:
- engine: keystone
- host: 127.0.0.1
- port: 35357
- user: nova
- password: password
- tenant: service
- message_queue:
- engine: rabbitmq
- host: 127.0.0.1
- port: 5672
- user: openstack
- password: password
- virtual_host: '/openstack'
- image:
- engine: glance
- host: 127.0.0.1
- port: 9292
- network:
- engine: neutron
- host: 127.0.0.1
- port: 9696
- cache:
- engine: memcached
- members:
- - host: 127.0.0.1
- port: 11211
- - host: 127.0.1.1
- port: 11211
- - host: 127.0.2.1
- port: 11211
diff --git "a/\173\173cookiecutter.project_name\175\175/tests/pillar/compute_single.sls" "b/\173\173cookiecutter.project_name\175\175/tests/pillar/compute_single.sls"
deleted file mode 100644
index 036a140..0000000
--- "a/\173\173cookiecutter.project_name\175\175/tests/pillar/compute_single.sls"
+++ /dev/null
@@ -1,45 +0,0 @@
-nova:
- compute:
- version: liberty
- enabled: true
- virtualization: kvm
- heal_instance_info_cache_interval: 60
- vncproxy_url: openstack:6080
- bind:
- vnc_address: 127.0.0.1
- vnc_port: 6080
- vnc_name: 0.0.0.0
- database:
- engine: mysql
- host: 127.0.0.1
- port: 3306
- name: nova
- user: nova
- password: password
- identity:
- engine: keystone
- host: 127.0.0.1
- port: 35357
- user: nova
- password: password
- tenant: service
- message_queue:
- engine: rabbitmq
- host: 127.0.0.1
- port: 5672
- user: openstack
- password: password
- virtual_host: '/openstack'
- image:
- engine: glance
- host: 127.0.0.1
- port: 9292
- network:
- engine: neutron
- host: 127.0.0.1
- port: 9696
- cache:
- engine: memcached
- members:
- - host: 127.0.0.1
- port: 11211
diff --git "a/\173\173cookiecutter.project_name\175\175/tests/pillar/control_cluster.sls" "b/\173\173cookiecutter.project_name\175\175/tests/pillar/control_cluster.sls"
deleted file mode 100644
index 158f565..0000000
--- "a/\173\173cookiecutter.project_name\175\175/tests/pillar/control_cluster.sls"
+++ /dev/null
@@ -1,48 +0,0 @@
-nova:
- controller:
- enabled: true
- networking: default
- version: liberty
- vncproxy_url: 127.0.0.1
- security_group: false
- dhcp_domain: novalocal
- scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
- cpu_allocation_ratio: 16.0
- ram_allocation_ratio: 1.5
- bind:
- private_address: 127.0.0.1
- public_address: 127.0.0.1
- public_name: 127.0.0.1
- novncproxy_port: 6080
- database:
- engine: mysql
- host: 127.0.0.1
- port: 3306
- name: nova
- user: nova
- password: password
- identity:
- engine: keystone
- host: 127.0.0.1
- port: 35357
- user: nova
- password: password
- tenant: service
- message_queue:
- engine: rabbitmq
- host: 127.0.0.1
- port: 5672
- user: openstack
- password: password
- virtual_host: '/openstack'
- ha_queues: true
- glance:
- host:
- port: 9292
- network:
- engine: neutron
- host: 127.0.0.1
- port: 9696
- mtu: 1500
- metadata:
- password: metadata
diff --git "a/\173\173cookiecutter.project_name\175\175/tests/pillar/control_single.sls" "b/\173\173cookiecutter.project_name\175\175/tests/pillar/control_single.sls"
deleted file mode 100644
index 68c77b2..0000000
--- "a/\173\173cookiecutter.project_name\175\175/tests/pillar/control_single.sls"
+++ /dev/null
@@ -1,52 +0,0 @@
-nova:
- controller:
- enabled: true
- networking: contrail
- version: liberty
- security_group: false
- vncproxy_url: 127.0.0.1
- dhcp_domain: novalocal
- scheduler_default_filters: "DifferentHostFilter,RetryFilter,AvailabilityZoneFilter,RamFilter,CoreFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
- cpu_allocation_ratio: 16.0
- ram_allocation_ratio: 1.5
- bind:
- private_address: 127.0.0.1
- public_address: 127.0.0.1
- public_name: 127.0.0.1
- novncproxy_port: 6080
- database:
- engine: mysql
- host: localhost
- port: 3306
- name: nova
- user: nova
- password: password
- identity:
- engine: keystone
- host: 127.0.0.1
- port: 35357
- user: nova
- password: password
- tenant: service
- message_queue:
- engine: rabbitmq
- host: 127.0.0.1
- port: 5672
- user: openstack
- password: password
- virtual_host: '/openstack'
- glance:
- host: 127.0.0.1
- port: 9292
- network:
- engine: neutron
- host: 127.0.0.1
- port: 9696
- mtu: 1500
- metadata:
- password: password
- cache:
- engine: memcached
- members:
- - host: 127.0.0.1
- port: 11211
diff --git "a/\173\173cookiecutter.project_name\175\175/tests/pillar/single.yml" "b/\173\173cookiecutter.project_name\175\175/tests/pillar/single.yml"
deleted file mode 100644
index 61ab117..0000000
--- "a/\173\173cookiecutter.project_name\175\175/tests/pillar/single.yml"
+++ /dev/null
@@ -1,5 +0,0 @@
-{{cookiecutter.service_name}}:
- {{cookiecutter.role_name}}:
- enabled: true
- bind:
- address: 0.0.0.0
diff --git "a/\173\173cookiecutter.project_name\175\175/tests/pillar/single.sls" "b/\173\173cookiecutter.project_name\175\175/tests/pillar/\173\173cookiecutter.role_name\175\175_single.sls"
similarity index 70%
rename from "\173\173cookiecutter.project_name\175\175/tests/pillar/single.sls"
rename to "\173\173cookiecutter.project_name\175\175/tests/pillar/\173\173cookiecutter.role_name\175\175_single.sls"
index 61ab117..0f7999d 100644
--- "a/\173\173cookiecutter.project_name\175\175/tests/pillar/single.sls"
+++ "b/\173\173cookiecutter.project_name\175\175/tests/pillar/\173\173cookiecutter.role_name\175\175_single.sls"
@@ -1,5 +1,3 @@
{{cookiecutter.service_name}}:
{{cookiecutter.role_name}}:
enabled: true
- bind:
- address: 0.0.0.0