From fe6511cfeb50544ce6d6ea8a66a8eac701564ba0 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 14 May 2018 11:07:22 -0700 Subject: [PATCH] deploy/upgrade: include tripleo_role_name "role_name" is internal to Ansible, we should not use it. As a transition, include "tripleo_role_name" when calling Ansible and once we're ready we'll remove the role_name var in a future patch. Change-Id: Ib477b35ed1c062f2ea6c7d9d2d41ac58f3b275e2 Related-Bug: #1771171 --- tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py | 1 + tripleoclient/tests/v1/tripleo/test_tripleo_upgrade.py | 1 + tripleoclient/v1/tripleo_deploy.py | 2 ++ 3 files changed, 4 insertions(+) diff --git a/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py b/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py index 970a080d4..32aff3fe1 100644 --- a/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py +++ b/tripleoclient/tests/v1/tripleo/test_tripleo_deploy.py @@ -339,6 +339,7 @@ class TestDeployUndercloud(TestPluginV1): mock_run.assert_called_once_with(self.cmd.log, [ 'ansible-playbook', '-i', '/tmp/inventory.yaml', 'deploy_steps_playbook.yaml', '-e', 'role_name=Undercloud', + '-e', 'tripleo_role_name=Undercloud', '-e', 'deploy_server_id=undercloud', '-e', 'bootstrap_server_id=undercloud']) diff --git a/tripleoclient/tests/v1/tripleo/test_tripleo_upgrade.py b/tripleoclient/tests/v1/tripleo/test_tripleo_upgrade.py index b17a434c9..ebea2cc84 100644 --- a/tripleoclient/tests/v1/tripleo/test_tripleo_upgrade.py +++ b/tripleoclient/tests/v1/tripleo/test_tripleo_upgrade.py @@ -40,6 +40,7 @@ class TestUpgrade(utils.TestCommand): mock_run.assert_called_once_with(self.cmd.log, [ 'ansible-playbook', '-i', '/tmp/inventory.yaml', 'upgrade_steps_playbook.yaml', '-e', 'role_name=Undercloud', + '-e', 'tripleo_role_name=Undercloud', '-e', 'deploy_server_id=undercloud', '-e', 'bootstrap_server_id=undercloud', '--skip-tags', 'validation']) diff --git a/tripleoclient/v1/tripleo_deploy.py b/tripleoclient/v1/tripleo_deploy.py index 8137a1747..9c07c8b4b 100644 --- a/tripleoclient/v1/tripleo_deploy.py +++ b/tripleoclient/v1/tripleo_deploy.py @@ -523,6 +523,7 @@ class Deploy(command.Command): playbook_inventory = os.path.join(ansible_dir, 'inventory.yaml') cmd = ['ansible-playbook', '-i', playbook_inventory, 'deploy_steps_playbook.yaml', '-e', 'role_name=Undercloud', + '-e', 'tripleo_role_name=Undercloud', '-e', 'deploy_server_id=undercloud', '-e', 'bootstrap_server_id=undercloud'] self.log.debug('Running Ansible Deploy tasks: %s' % (' '.join(cmd))) @@ -534,6 +535,7 @@ class Deploy(command.Command): playbook_inventory = os.path.join(ansible_dir, 'inventory.yaml') cmd = ['ansible-playbook', '-i', playbook_inventory, 'upgrade_steps_playbook.yaml', '-e', 'role_name=Undercloud', + '-e', 'tripleo_role_name=Undercloud', '-e', 'deploy_server_id=undercloud', '-e', 'bootstrap_server_id=undercloud', '--skip-tags', 'validation'] self.log.debug('Running Ansible Upgrade tasks: %s' % (' '.join(cmd)))