From fc93fc4464389914e47e4d5021a07d3588295400 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Fri, 27 Mar 2015 11:16:43 +0100 Subject: [PATCH] Rename instances_config to infra_config and node_type for infra_type Makes more sense to me that naming --- instances_config.yml => infra_config.yml | 12 ++++++------ roles/create_openstack_instances/tasks/main.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename instances_config.yml => infra_config.yml (85%) diff --git a/instances_config.yml b/infra_config.yml similarity index 85% rename from instances_config.yml rename to infra_config.yml index 0de2fa7..0460da4 100644 --- a/instances_config.yml +++ b/infra_config.yml @@ -1,27 +1,27 @@ --- -instances_config: +infra_config: - name: puppetdb.infra.test.rcarrillocruz.cloud image: 9d25fe2d-cf31-4b05-8c58-f238ec78e633 flavor: standard.small net_name: infra-test-network - node_type: puppetdb + infra_type: puppetdb - name: puppetmaster.infra.test.rcarrillocruz.cloud image: 9d25fe2d-cf31-4b05-8c58-f238ec78e633 flavor: standard.small net_name: infra-test-network - node_type: puppetmaster + infra_type: puppetmaster - name: jenkins.infra.test.rcarrillocruz.cloud image: 9d25fe2d-cf31-4b05-8c58-f238ec78e633 flavor: standard.small net_name: infra-test-network - node_type: jenkins + infra_type: jenkins - name: gerrit.infra.test.rcarrillocruz.cloud image: 9d25fe2d-cf31-4b05-8c58-f238ec78e633 flavor: standard.small net_name: infra-test-network - node_type: gerrit + infra_type: gerrit - name: nodepool.infra.test.rcarrillocruz.cloud image: 9d25fe2d-cf31-4b05-8c58-f238ec78e633 flavor: standard.small net_name: infra-test-network - node_type: nodepool + infra_type: nodepool diff --git a/roles/create_openstack_instances/tasks/main.yml b/roles/create_openstack_instances/tasks/main.yml index b104cba..4e0584d 100644 --- a/roles/create_openstack_instances/tasks/main.yml +++ b/roles/create_openstack_instances/tasks/main.yml @@ -15,5 +15,5 @@ auto_floating_ip: yes meta: group: infra - node_type: "{{ item.node_type }}" - with_items: instances_config + infra_type: "{{ item.infra_type }}" + with_items: infra_config