states: maas: Stop using maas-stable PPA 35/48635/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 9 Dec 2017 20:40:22 +0000 (21:40 +0100)
committerMichael Polenchuk <mpolenchuk@mirantis.com>
Mon, 11 Dec 2017 09:24:04 +0000 (09:24 +0000)
Currently, Xenial repos provide MaaS 2.2.x, while the PPA bumped it
to 2.3.x. Since we switched to 2.3, we observed a rare wrongful state
transition from 'Deploying' back to 'Ready'.
Drop the PPA, falling back to 2.2 from mainline distro repos.

JIRA: FUEL-312

Change-Id: I3daa118059f37cbeca076da685661c28f3a28a97
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 9da33bc85d681950a09452f28ca39df2108b0b56)

mcp/config/states/maas

index 7ccf018..24cefe8 100755 (executable)
@@ -65,8 +65,6 @@ if [ "${ERASE_ENV}" -gt 1 ]; then
 fi
 
 # MaaS rack/region controller, node commissioning
-salt -C 'mas01*' cmd.run "add-apt-repository ppa:maas/stable"
-
 salt -C 'mas01*' state.apply linux,salt,openssh,ntp
 salt -C 'mas01*' state.apply linux.network.interface
 salt -C 'mas01*' state.apply maas.pxe_nat