diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-06-04 17:55:52 +0400 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-07 12:43:10 +0000 |
| commit | afae8d4d99d962448eb62cdd306f7a3dcda83744 (patch) | |
| tree | 09d568175957ab7155c327237313f0c3e542bcac /mcp/config | |
| parent | 78d368731c9582361cc291d5618e01702982f2b9 (diff) | |
[noha] Update OpenStack version to Queens
* make cluster names version-agnostic
* pre-install oslo-templates formula
* salt version update to 2017.7
* system reclass update
Change-Id: I903895f6bcd98a1062e66e3f14d23ec04dc1b869
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/config')
| -rw-r--r-- | mcp/config/scenario/defaults.yaml | 12 | ||||
| -rw-r--r-- | mcp/config/scenario/os-nosdn-nofeature-noha.yaml | 2 | ||||
| -rw-r--r-- | mcp/config/scenario/os-nosdn-ovs-noha.yaml | 2 | ||||
| -rw-r--r-- | mcp/config/scenario/os-odl-nofeature-noha.yaml | 2 | ||||
| -rw-r--r-- | mcp/config/scenario/os-odl-ovs-noha.yaml | 2 | ||||
| -rw-r--r-- | mcp/config/scenario/os-ovn-nofeature-noha.yaml | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml index 6affc7da6..283ffc542 100644 --- a/mcp/config/scenario/defaults.yaml +++ b/mcp/config/scenario/defaults.yaml @@ -14,10 +14,10 @@ x86_64: common: apt: keys: - - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub + - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub repos: # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp> - - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main + - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main pkg: install: - linux-generic-hwe-16.04 @@ -35,12 +35,12 @@ aarch64: common: apt: keys: - - https://linux.enea.com/mcp-repos/pike/xenial/archive-mcppike.key - - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11/SALTSTACK-GPG-KEY.pub + - https://linux.enea.com/mcp-repos/queens/xenial/archive-mcpqueens.key + - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub repos: # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp> - - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main - - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike-armband main + - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7 xenial main + - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/queens/xenial queens-armband main pkg: install: - linux-generic-hwe-16.04 diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index 3a36ae297..1926d4977 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-pike-ovs-noha.local + domain: mcp-ovs-noha.local states: - openstack_noha - neutron_gateway diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml index eed17c1a4..b44647c25 100644 --- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-pike-ovs-dpdk-noha.local + domain: mcp-ovs-dpdk-noha.local states: - dpdk - openstack_noha diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml index f52eaf5aa..c61abd539 100644 --- a/mcp/config/scenario/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-pike-odl-noha.local + domain: mcp-odl-noha.local states: - opendaylight - openstack_noha diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml index c282707f7..84eaf6318 100644 --- a/mcp/config/scenario/os-odl-ovs-noha.yaml +++ b/mcp/config/scenario/os-odl-ovs-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-pike-odl-noha.local + domain: mcp-odl-noha.local states: - dpdk - opendaylight diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml index 104df96d3..d2015754e 100644 --- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml @@ -7,7 +7,7 @@ ############################################################################## --- cluster: - domain: mcp-pike-ovn-noha.local + domain: mcp-ovn-noha.local states: - openstack_noha - networks |