starlingx/ansible-playbooks
Code Issues Proposed changes

Remove the dependency of controllerconfig

Browse Source 
As controllerconfig is being cleaned up, remove the dependency
of controllerconfig in Ansible playbook. This commit also copies
over the registry cert template from puppet as it's only been
used at bootstrap time.

Change-Id: I820d968629a920dfe9846c5f855b048a6ae85e29
Closes-Bug: 1834218
Signed-off-by: Angie Wang <angie.wang@windriver.com>
This commit is contained in:
Angie Wang
2020-01-17 15:07:39 -05:00
parent ae1e45e00e
commit 3d6483194e
8 changed files with 184 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
playbookconfig/centos/playbookconfig.spec
View File

@@ -15,6 +15,7 @@ Requires: python2-ptyprocess
Requires: python2-pexpect
Requires: sshpass
Requires: sysinv
Requires: cgts-client
%description
This package contains playbooks used for configuring StarlingX.

1
playbookconfig/opensuse/playbookconfig.spec
View File

@@ -15,6 +15,7 @@ Requires: python2-ptyprocess
Requires: python2-pexpect
Requires: sshpass
Requires: sysinv
Requires: cgts-client
BuildArch: noarch

25
playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/tasks/bringup_local_registry.yml
View File

@@ -1,6 +1,6 @@
---
#
# Copyright (c) 2019 Wind River Systems, Inc.
# Copyright (c) 2019-2020 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@@ -100,22 +100,15 @@
REGISTRY_KS_ENDPOINT: "http://{{ controller_floating_address_url }}:5000/v3"
- block:
- name: Generate cnf file from template
copy:
src: "{{ cert_cnf_template }}"
dest: "{{ cert_cnf_file }}"
remote_src: yes
- name: Set network info for docker registry
set_fact:
docker_registry_ip: "{{ controller_floating_address }}"
docker_registry_public_ip: "{{ external_oam_floating_address }}"
- name: Update cnf file with network info
command: "{{ item }}"
args:
warn: false
with_items:
- "sed -i -e 's|<%= @docker_registry_ip %>|'$DOCKER_REGISTRY_IP'|g' {{ cert_cnf_file }}"
- "sed -i -e 's|<%= @docker_registry_public_ip %>|'$DOCKER_REGISTRY_PUBLIC_IP'|g' {{ cert_cnf_file }}"
environment:
DOCKER_REGISTRY_IP: "{{ controller_floating_address }}"
DOCKER_REGISTRY_PUBLIC_IP: "{{ external_oam_floating_address }}"
- name: Generate cnf file from template
template:
src: "registry-cert-extfile.j2"
dest: "{{ cert_cnf_file }}"
- name: Generate certificate and key files
command: >-

13
playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/registry-cert-extfile.j2 Normal file
View File

@@ -0,0 +1,13 @@
[req]
prompt = no
x509_extensions = v3_req
distinguished_name = dn
[dn]
CN = registry.local
[v3_req]
subjectAltName = @alt_names
[alt_names]
DNS.1 = registry.local
DNS.2 = registry.central
IP.1 = "{{ docker_registry_ip }}"
IP.2 = "{{ docker_registry_public_ip }}"

1
playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/vars/main.yml
View File

@@ -15,7 +15,6 @@ registry_readonly_config_file: /etc/docker-distribution/registry/readonly_config
registry_config_file: /etc/docker-distribution/registry/config.yml
registry_token_server_template: /usr/share/puppet/modules/platform/templates/registry-token-server.conf.erb
registry_token_server_file: /etc/docker-distribution/registry/token_server.conf
cert_cnf_template: /usr/share/puppet/modules/platform/templates/registry-cert-extfile.erb
insecure_docker_registry_template: /usr/share/puppet/modules/platform/templates/insecuredockerregistry.conf.erb
cert_cnf_file: /etc/ssl/private/registry-cert-extfile.cnf
registry_cert_key: /etc/ssl/private/registry-cert.key

133
playbookconfig/src/playbooks/roles/bootstrap/persist-config/files/populate_initial_config.py
View File

@@ -16,16 +16,8 @@ import subprocess
import sys
import time
# The following imports are to make use of the OpenStack cgtsclient and some
# constants in controllerconfig. When it is time to remove/deprecate these
# packages, classes OpenStack, Token and referenced constants need to be moved
# to this standalone script.
from controllerconfig.common import constants
from controllerconfig import ConfigFail
from controllerconfig import openstack
from controllerconfig import sysinv_api as sysinv
from netaddr import IPNetwork
from cgtsclient import client as cgts_client
from sysinv.common import constants as sysinv_constants
try:
@@ -41,9 +33,82 @@ RECONFIGURE_NETWORK = False
RECONFIGURE_SERVICE = False
INITIAL_POPULATION = True
INCOMPLETE_BOOTSTRAP = False
SYSTEM_CONFIG_TIMEOUT = 420
CONF = ConfigParser()
class CgtsClient(object):
SYSINV_API_VERSION = 1
def __init__(self):
self.conf = {}
self._sysinv = None
source_command = 'source /etc/platform/openrc && env'
with open(os.devnull, "w") as fnull:
proc = subprocess.Popen(
['bash', '-c', source_command],
stdout=subprocess.PIPE, stderr=fnull)
for line in proc.stdout:
key, _, value = line.partition("=")
if key == 'OS_USERNAME':
self.conf['admin_user'] = value.strip()
elif key == 'OS_PASSWORD':
self.conf['admin_pwd'] = value.strip()
elif key == 'OS_PROJECT_NAME':
self.conf['admin_tenant'] = value.strip()
elif key == 'OS_AUTH_URL':
self.conf['auth_url'] = value.strip()
elif key == 'OS_REGION_NAME':
self.conf['region_name'] = value.strip()
elif key == 'OS_USER_DOMAIN_NAME':
self.conf['user_domain'] = value.strip()
elif key == 'OS_PROJECT_DOMAIN_NAME':
self.conf['project_domain'] = value.strip()
proc.communicate()
@property
def sysinv(self):
if not self._sysinv:
self._sysinv = cgts_client.get_client(
self.SYSINV_API_VERSION,
os_username=self.conf['admin_user'],
os_password=self.conf['admin_pwd'],
os_auth_url=self.conf['auth_url'],
os_project_name=self.conf['admin_tenant'],
os_project_domain_name=self.conf['project_domain'],
os_user_domain_name=self.conf['user_domain'],
os_region_name=self.conf['region_name'],
os_service_type='platform',
os_endpoint_type='admin')
return self._sysinv
class ConfigFail(Exception):
"""Base class for general configuration exceptions."""
def __init__(self, message=None):
self.message = message
super(ConfigFail, self).__init__(message)
def __str__(self):
return self.message or ""
def dict_to_patch(values, install_action=False):
# install default action
if install_action:
values.update({'action': 'install'})
patch = []
for key, value in values.items():
path = '/' + key
patch.append({'op': 'replace', 'path': path, 'value': value})
return patch
def touch(fname):
with open(fname, 'a'):
os.utime(fname, None)
@@ -55,7 +120,7 @@ def is_subcloud():
def wait_system_config(client):
for _ in range(constants.SYSTEM_CONFIG_TIMEOUT):
for _ in range(SYSTEM_CONFIG_TIMEOUT):
try:
systems = client.sysinv.isystem.list()
if systems:
@@ -115,7 +180,7 @@ def populate_system_config(client):
{'system_type': CONF.get('BOOTSTRAP_CONFIG', 'SYSTEM_TYPE')}
)
patch = sysinv.dict_to_patch(values)
patch = dict_to_patch(values)
try:
client.sysinv.isystem.update(system.uuid, patch)
except Exception as e:
@@ -547,7 +612,7 @@ def populate_dns_config(client):
'nameservers': nameservers.rstrip(','),
'action': 'apply'
}
patch = sysinv.dict_to_patch(values)
patch = dict_to_patch(values)
client.sysinv.idns.update(dns_record.uuid, patch)
print("DNS config completed.")
@@ -842,16 +907,16 @@ def populate_controller_config(client):
install_output = get_orig_install_mode()
print("Install output = %s" % install_output)
provision_state = sysinv.HOST_PROVISIONING
provision_state = sysinv_constants.PROVISIONING
values = {
'personality': sysinv.HOST_PERSONALITY_CONTROLLER,
'personality': sysinv_constants.CONTROLLER,
'hostname': CONF.get('BOOTSTRAP_CONFIG', 'CONTROLLER_HOSTNAME'),
'mgmt_ip': CONF.get('BOOTSTRAP_CONFIG', 'CONTROLLER_0_ADDRESS'),
'mgmt_mac': mgmt_mac,
'administrative': sysinv.HOST_ADMIN_STATE_LOCKED,
'operational': sysinv.HOST_OPERATIONAL_STATE_DISABLED,
'availability': sysinv.HOST_AVAIL_STATE_OFFLINE,
'administrative': sysinv_constants.ADMIN_LOCKED,
'operational': sysinv_constants.OPERATIONAL_DISABLED,
'availability': sysinv_constants.AVAILABILITY_OFFLINE,
'invprovision': provision_state,
'rootfs_device': rootfs_device,
'boot_device': boot_device,
@@ -878,7 +943,7 @@ def populate_controller_config(client):
def wait_initial_inventory_complete(client, host):
for _ in range(constants.SYSTEM_CONFIG_TIMEOUT / 10):
for _ in range(SYSTEM_CONFIG_TIMEOUT / 10):
try:
host = client.sysinv.ihost.get('controller-0')
if host and (host.inv_state ==
@@ -960,25 +1025,21 @@ if __name__ == '__main__':
INCOMPLETE_BOOTSTRAP = CONF.getboolean('BOOTSTRAP_CONFIG',
'INCOMPLETE_BOOTSTRAP')
# Puppet manifest might be applied as part of initial host
# config, set INITIAL_CONFIG_PRIMARY variable just in case.
os.environ["INITIAL_CONFIG_PRIMARY"] = "true"
try:
with openstack.OpenStack() as client:
populate_system_config(client)
populate_load_config(client)
populate_network_config(client)
populate_dns_config(client)
populate_docker_config(client)
controller = populate_controller_config(client)
inventory_config_complete_wait(client, controller)
populate_default_storage_backend(client, controller)
os.remove(config_file)
if INITIAL_POPULATION:
print("Successfully updated the initial system config.")
else:
print("Successfully provisioned the initial system config.")
client = CgtsClient()
populate_system_config(client)
populate_load_config(client)
populate_network_config(client)
populate_dns_config(client)
populate_docker_config(client)
controller = populate_controller_config(client)
inventory_config_complete_wait(client, controller)
populate_default_storage_backend(client, controller)
os.remove(config_file)
if INITIAL_POPULATION:
print("Successfully updated the initial system config.")
else:
print("Successfully provisioned the initial system config.")
except Exception:
# Print the marker string for Ansible and re raise the exception
if INITIAL_POPULATION:

10
playbookconfig/src/playbooks/roles/bootstrap/prepare-env/tasks/main.yml
View File

@@ -9,17 +9,17 @@
# the next step.
#
# Check for one of unmistakenly StarlingX packages
- name: "Look for unmistakenly {{ image_brand }} package"
command: rpm -q controllerconfig
# Check for unmistakenly StarlingX packages
- name: "Look for unmistakenly {{ image_brand }} packages"
command: rpm -q sysinv cgts-client
args:
warn: false
failed_when: false
register: controllerconfig_installed
register: packages_installed
- name: Fail if host is not running the right image
fail: msg='Host {{ ansible_host }} does not have the right image!.'
when: controllerconfig_installed.rc > 0
when: packages_installed.rc > 0
# Bail if the host has been unlocked
- name: Check initial config flag

66
playbookconfig/src/playbooks/roles/recover-ceph-data/files/prepare_ceph_partitions.py
View File

@@ -10,7 +10,7 @@ import json
import shutil
import subprocess
from controllerconfig import openstack
from cgtsclient import client as cgts_client
from tsconfig import tsconfig as tsc
OSD_ROOT_DIR = "/var/lib/ceph/osd"
@@ -20,14 +20,64 @@ CEPH_MON_VG = 'cgts-vg'
CEPH_MON_LV = 'ceph-mon-lv'
class CgtsClient(object):
SYSINV_API_VERSION = 1
def __init__(self):
self.conf = {}
self._sysinv = None
source_command = 'source /etc/platform/openrc && env'
with open(os.devnull, "w") as fnull:
proc = subprocess.Popen(
['bash', '-c', source_command],
stdout=subprocess.PIPE, stderr=fnull)
for line in proc.stdout:
key, _, value = line.partition("=")
if key == 'OS_USERNAME':
self.conf['admin_user'] = value.strip()
elif key == 'OS_PASSWORD':
self.conf['admin_pwd'] = value.strip()
elif key == 'OS_PROJECT_NAME':
self.conf['admin_tenant'] = value.strip()
elif key == 'OS_AUTH_URL':
self.conf['auth_url'] = value.strip()
elif key == 'OS_REGION_NAME':
self.conf['region_name'] = value.strip()
elif key == 'OS_USER_DOMAIN_NAME':
self.conf['user_domain'] = value.strip()
elif key == 'OS_PROJECT_DOMAIN_NAME':
self.conf['project_domain'] = value.strip()
proc.communicate()
@property
def sysinv(self):
if not self._sysinv:
self._sysinv = cgts_client.get_client(
self.SYSINV_API_VERSION,
os_username=self.conf['admin_user'],
os_password=self.conf['admin_pwd'],
os_auth_url=self.conf['auth_url'],
os_project_name=self.conf['admin_tenant'],
os_project_domain_name=self.conf['project_domain'],
os_user_domain_name=self.conf['user_domain'],
os_region_name=self.conf['region_name'],
os_service_type='platform',
os_endpoint_type='admin')
return self._sysinv
def get_ceph_mon_size():
with openstack.OpenStack() as client:
ceph_mons = client.sysinv.ceph_mon.list()
# All Ceph monitor partitions have the same size, so grab one and return.
if ceph_mons:
return ceph_mons[0].ceph_mon_gib
else:
raise Exception("No ceph monitor defined!")
client = CgtsClient()
ceph_mons = client.sysinv.ceph_mon.list()
# All Ceph monitor partitions have the same size, so grab one and return.
if ceph_mons:
return ceph_mons[0].ceph_mon_gib
else:
raise Exception("No ceph monitor defined!")
def mount_osds():