From 5ca8cf49d67662299859040e98b17a2fac84fd9c Mon Sep 17 00:00:00 2001 From: Alexander Arzhanov Date: Thu, 11 Feb 2016 13:12:18 +0000 Subject: [PATCH] Configure correct gateway for cinder-vmware and compute-vmware nodes - Add cinder-vmware and compute-vmware roles to task configure_default_route like compute and cinder nodes. - Fix incorrect fixture. Change-Id: I0ff62276375de4355cfc00a884f47697a11436f1 Closes-bug: #1544067 --- deployment/puppet/osnailyfacter/modular/astute/tasks.yaml | 2 +- tests/noop/astute.yaml/novanet_vlan.compute-vmware-role.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml index 2bca2df3cf..d809367949 100644 --- a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml +++ b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml @@ -93,7 +93,7 @@ - id: configure_default_route type: puppet - role: [primary-mongo, mongo, compute, ceph-osd, cinder, zabbix-server] + role: [primary-mongo, mongo, compute, compute-vmware, ceph-osd, cinder, cinder-vmware, zabbix-server] requires: [post_deployment_start] required_for: [post_deployment_end] parameters: diff --git a/tests/noop/astute.yaml/novanet_vlan.compute-vmware-role.yaml b/tests/noop/astute.yaml/novanet_vlan.compute-vmware-role.yaml index 1f84f40bad..aedea857d2 100644 --- a/tests/noop/astute.yaml/novanet_vlan.compute-vmware-role.yaml +++ b/tests/noop/astute.yaml/novanet_vlan.compute-vmware-role.yaml @@ -541,6 +541,7 @@ repo_setup: local: "/var/www/nailgun/ubuntu/x86_64/images/initrd.gz" remote_relative: dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/initrd.gz deployment_mode: ha_compact +management_vrouter_vip: 172.16.1.2 novanetwork_parameters: vlan_start: 103 network_manager: VlanManager