Merge "Support node-attributes in Azure driver"
This commit is contained in:
commit
0c51cb759e
|
@ -392,6 +392,12 @@ section of the configuration.
|
||||||
|
|
||||||
A unique name within the provider for this pool of resources.
|
A unique name within the provider for this pool of resources.
|
||||||
|
|
||||||
|
.. attr:: node-attributes
|
||||||
|
:type: dict
|
||||||
|
|
||||||
|
A dictionary of key-value pairs that will be stored with the node data
|
||||||
|
in ZooKeeper. The keys and values can be any arbitrary string.
|
||||||
|
|
||||||
.. attr:: ipv4
|
.. attr:: ipv4
|
||||||
:type: bool
|
:type: bool
|
||||||
|
|
||||||
|
|
|
@ -166,6 +166,7 @@ class AzurePool(ConfigPool):
|
||||||
self.load(pool_config)
|
self.load(pool_config)
|
||||||
|
|
||||||
def load(self, pool_config):
|
def load(self, pool_config):
|
||||||
|
super().load(pool_config)
|
||||||
self.name = pool_config['name']
|
self.name = pool_config['name']
|
||||||
self.max_servers = pool_config['max-servers']
|
self.max_servers = pool_config['max-servers']
|
||||||
self.public_ipv4 = pool_config.get('public-ipv4',
|
self.public_ipv4 = pool_config.get('public-ipv4',
|
||||||
|
|
|
@ -35,6 +35,9 @@ providers:
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 10
|
max-servers: 10
|
||||||
|
node-attributes:
|
||||||
|
key1: value1
|
||||||
|
key2: value2
|
||||||
labels:
|
labels:
|
||||||
- name: bionic
|
- name: bionic
|
||||||
diskimage: fake-image
|
diskimage: fake-image
|
||||||
|
|
|
@ -36,6 +36,9 @@ providers:
|
||||||
pools:
|
pools:
|
||||||
- name: main
|
- name: main
|
||||||
max-servers: 10
|
max-servers: 10
|
||||||
|
node-attributes:
|
||||||
|
key1: value1
|
||||||
|
key2: value2
|
||||||
labels:
|
labels:
|
||||||
- name: bionic
|
- name: bionic
|
||||||
cloud-image: bionic
|
cloud-image: bionic
|
||||||
|
@ -44,4 +47,4 @@ providers:
|
||||||
tags:
|
tags:
|
||||||
department: R&D
|
department: R&D
|
||||||
team: DevOps
|
team: DevOps
|
||||||
systemPurpose: CI
|
systemPurpose: CI
|
||||||
|
|
|
@ -54,6 +54,8 @@ class TestDriverAzure(tests.DBTestCase):
|
||||||
self.assertEqual(node.state, zk.READY)
|
self.assertEqual(node.state, zk.READY)
|
||||||
self.assertIsNotNone(node.launcher)
|
self.assertIsNotNone(node.launcher)
|
||||||
self.assertEqual(node.connection_type, 'ssh')
|
self.assertEqual(node.connection_type, 'ssh')
|
||||||
|
self.assertEqual(node.attributes,
|
||||||
|
{'key1': 'value1', 'key2': 'value2'})
|
||||||
|
|
||||||
def test_azure_diskimage(self):
|
def test_azure_diskimage(self):
|
||||||
configfile = self.setup_config(
|
configfile = self.setup_config(
|
||||||
|
@ -83,3 +85,5 @@ class TestDriverAzure(tests.DBTestCase):
|
||||||
self.assertEqual(node.state, zk.READY)
|
self.assertEqual(node.state, zk.READY)
|
||||||
self.assertIsNotNone(node.launcher)
|
self.assertIsNotNone(node.launcher)
|
||||||
self.assertEqual(node.connection_type, 'ssh')
|
self.assertEqual(node.connection_type, 'ssh')
|
||||||
|
self.assertEqual(node.attributes,
|
||||||
|
{'key1': 'value1', 'key2': 'value2'})
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The node-attributes setting has been added to the Azure driver.
|
Loading…
Reference in New Issue