mirror of
				https://github.com/iiab/iiab.git
				synced 2025-03-09 15:40:17 +00:00 
			
		
		
		
	let's not restrict PPA repo to Ansible 2.4.x if poss?
This commit is contained in:
		
							parent
							
								
									c7e611b755
								
							
						
					
					
						commit
						a87d41d2bc
					
				
					 1 changed files with 4 additions and 2 deletions
				
			
		| 
						 | 
					@ -41,7 +41,8 @@ if ! which ansible-playbook ; then
 | 
				
			||||||
    elif [ -f /etc/debian_version ] || (grep -qi raspbian /etc/*elease) ; then
 | 
					    elif [ -f /etc/debian_version ] || (grep -qi raspbian /etc/*elease) ; then
 | 
				
			||||||
        if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then
 | 
					        if ( ! grep -qi ansible /etc/apt/sources.list) && [ ! -f /etc/apt/sources.list.d/ansible ]; then
 | 
				
			||||||
            apt -y install dirmngr python-pip python-setuptools python-wheel patch
 | 
					            apt -y install dirmngr python-pip python-setuptools python-wheel patch
 | 
				
			||||||
            echo "deb http://ppa.launchpad.net/ansible/ansible-2.4/ubuntu xenial main" \
 | 
					            # echo "deb http://ppa.launchpad.net/ansible/ansible-2.4/ubuntu xenial main" \
 | 
				
			||||||
 | 
					            echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \
 | 
				
			||||||
                 >> /etc/apt/sources.list.d/ansible.list
 | 
					                 >> /etc/apt/sources.list.d/ansible.list
 | 
				
			||||||
            apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
 | 
					            apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367
 | 
				
			||||||
        fi
 | 
					        fi
 | 
				
			||||||
| 
						 | 
					@ -50,6 +51,7 @@ if ! which ansible-playbook ; then
 | 
				
			||||||
        # Parens are optional, but greatly clarify :)
 | 
					        # Parens are optional, but greatly clarify :)
 | 
				
			||||||
    elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then
 | 
					    elif (grep -qi ubuntu /etc/lsb-release) || (grep -qi ubuntu /etc/os-release); then
 | 
				
			||||||
        apt -y install python-pip python-setuptools python-wheel patch
 | 
					        apt -y install python-pip python-setuptools python-wheel patch
 | 
				
			||||||
 | 
					        # apt-add-repository -y ppa:ansible/ansible-2.4
 | 
				
			||||||
        apt-add-repository -y ppa:ansible/ansible
 | 
					        apt-add-repository -y ppa:ansible/ansible
 | 
				
			||||||
        # FOUND="true"
 | 
					        # FOUND="true"
 | 
				
			||||||
        # FAMILY="debian"
 | 
					        # FAMILY="debian"
 | 
				
			||||||
| 
						 | 
					@ -83,7 +85,7 @@ if [ ! -f /etc/centos-release ] && [ ! -f /etc/fedora-release ] && [ ! -f /etc/o
 | 
				
			||||||
    # Align IIAB with Ansible community's latest official release
 | 
					    # Align IIAB with Ansible community's latest official release
 | 
				
			||||||
    echo "Using apt to check for updates, then install/upgrade ansible"
 | 
					    echo "Using apt to check for updates, then install/upgrade ansible"
 | 
				
			||||||
    apt update
 | 
					    apt update
 | 
				
			||||||
    apt -y install ansible
 | 
					    apt -y install ansible=2.4*
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    # TEMPORARILY USE ANSIBLE 2.4.2 DUE TO 2.4.3 MEMORY BUG. DETAILS @ https://github.com/iiab/iiab/issues/669
 | 
					    # TEMPORARILY USE ANSIBLE 2.4.2 DUE TO 2.4.3 MEMORY BUG. DETAILS @ https://github.com/iiab/iiab/issues/669
 | 
				
			||||||
    #echo "Install http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb"
 | 
					    #echo "Install http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue