Skip to content

Commit 6e7cb3d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1209 from beagles/basic-designate
Designate: service and password handling
2 parents a8ddcba + 833cf2b commit 6e7cb3d

10 files changed

Lines changed: 40 additions & 5 deletions

File tree

‎docs_user/modules/proc_adopting-the-identity-service.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ control plane, excluding the {identity_service} and its endpoints:
6969
+
7070
----
7171
$ openstack endpoint list | grep keystone | awk '/admin/{ print $2; }' | xargs ${BASH_ALIASES[openstack]} endpoint delete || true
72-
> for service in aodh heat heat-cfn barbican cinderv3 glance gnocchi manila manilav2 neutron nova placement swift ironic-inspector ironic octavia; do
72+
> for service in aodh heat heat-cfn barbican cinderv3 glance designate gnocchi manila manilav2 neutron nova placement swift ironic-inspector ironic octavia; do
7373
> openstack service list | awk "/ $service /{ print \$2; }" | xargs -r ${BASH_ALIASES[openstack]} service delete || true
7474
> done
7575
----

‎docs_user/modules/proc_deploying-backend-services.adoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ BARBICAN_PASSWORD=$(cat ${TRIPLEO_PASSWORDS[default]} | grep ' BarbicanPassword:
6060
CEILOMETER_METERING_SECRET=$(cat ${TRIPLEO_PASSWORDS[default]} | grep ' CeilometerMeteringSecret:' | awk -F ': ' '{ print $2; }')
6161
CEILOMETER_PASSWORD=$(cat ${TRIPLEO_PASSWORDS[default]} | grep ' CeilometerPassword:' | awk -F ': ' '{ print $2; }')
6262
CINDER_PASSWORD=$(cat ${TRIPLEO_PASSWORDS[default]} | grep ' CinderPassword:' | awk -F ': ' '{ print $2; }')
63+
DESIGNATE_PASSWORD=$(cat ${TRIPLEO_PASSWORDS[default]} | grep ' DesignatePassword:' | awk -F ': ' '{ print $2; }')
6364
GLANCE_PASSWORD=$(cat ${TRIPLEO_PASSWORDS[default]} | grep ' GlancePassword:' | awk -F ': ' '{ print $2; }')
6465
HEAT_AUTH_ENCRYPTION_KEY=$(cat ${TRIPLEO_PASSWORDS[default]} | grep ' HeatAuthEncryptionKey:' | awk -F ': ' '{ print $2; }')
6566
HEAT_PASSWORD=$(cat ${TRIPLEO_PASSWORDS[default]} | grep ' HeatPassword:' | awk -F ': ' '{ print $2; }')
@@ -114,6 +115,7 @@ $ oc set data secret/osp-secret "AodhPassword=$AODH_PASSWORD"
114115
$ oc set data secret/osp-secret "BarbicanPassword=$BARBICAN_PASSWORD"
115116
$ oc set data secret/osp-secret "CeilometerPassword=$CEILOMETER_PASSWORD"
116117
$ oc set data secret/osp-secret "CinderPassword=$CINDER_PASSWORD"
118+
$ oc set data secret/osp-secret "DesignatePassword=$DESIGNATE_PASSWORD"
117119
$ oc set data secret/osp-secret "GlancePassword=$GLANCE_PASSWORD"
118120
$ oc set data secret/osp-secret "HeatAuthEncryptionKey=$HEAT_AUTH_ENCRYPTION_KEY"
119121
$ oc set data secret/osp-secret "HeatPassword=$HEAT_PASSWORD"

‎docs_user/modules/proc_rolling-back-the-control-plane-adoption.adoc‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ ServicesToStart=("tripleo_horizon.service"
3535
"tripleo_cinder_scheduler.service"
3636
"tripleo_cinder_volume.service"
3737
"tripleo_cinder_backup.service"
38+
"tripleo_designate_api.service"
39+
"tripleo_designate_backend_bind9.service"
40+
"tripleo_designate_central.service"
41+
"tripleo_designate_mdns.service"
42+
"tripleo_designate_producer.service"
43+
"tripleo_designate_worker.service"
3844
"tripleo_glance_api.service"
3945
"tripleo_manila_api.service"
4046
"tripleo_manila_api_cron.service"
@@ -64,7 +70,8 @@ ServicesToStart=("tripleo_horizon.service"
6470
"tripleo_octavia_rsyslog.service"
6571
"tripleo_octavia_driver_agent.service"
6672
"tripleo_octavia_housekeeping.service"
67-
"tripleo_octavia_worker.service")
73+
"tripleo_octavia_worker.service"
74+
"tripleo_unbound.service")
6875
6976
PacemakerResourcesToStart=("galera-bundle"
7077
"haproxy-bundle"

‎docs_user/modules/proc_stopping-openstack-services.adoc‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ ServicesToStop=("tripleo_aodh_api.service"
8989
"tripleo_aodh_notifier.service"
9090
"tripleo_ceilometer_agent_central.service"
9191
"tripleo_ceilometer_agent_notification.service"
92+
"tripleo_designate_api.service"
93+
"tripleo_designate_backend_bind9.service"
94+
"tripleo_designate_central.service"
95+
"tripleo_designate_mdns.service"
96+
"tripleo_designate_producer.service"
97+
"tripleo_designate_worker.service"
9298
"tripleo_octavia_api.service"
9399
"tripleo_octavia_health_manager.service"
94100
"tripleo_octavia_rsyslog.service"
@@ -137,7 +143,8 @@ ServicesToStop=("tripleo_aodh_api.service"
137143
"tripleo_ironic_conductor.service"
138144
"tripleo_ironic_inspector_dnsmasq.service"
139145
"tripleo_ironic_pxe_http.service"
140-
"tripleo_ironic_pxe_tftp.service")
146+
"tripleo_ironic_pxe_tftp.service"
147+
"tripleo_unbound.service")
141148
142149
PacemakerResourcesToStop=("openstack-cinder-volume"
143150
"openstack-cinder-backup"

‎tests/roles/backend_services/defaults/main.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ aodh_password: ''
55
barbican_password: ''
66
ceilometer_password: ''
77
cinder_password: ''
8+
designate_password: ''
89
manila_password: ''
910
glance_password: ''
1011
ironic_password: ''

‎tests/roles/backend_services/tasks/main.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
{% if cinder_password %}
2929
oc set data secret/osp-secret "CinderPassword={{ cinder_password }}"
3030
{% endif %}
31+
{% if designate_password %}
32+
oc set data secret/osp-secret "DesignatePassword={{ designate_password }}"
33+
{% endif %}
3134
{% if glance_password %}
3235
oc set data secret/osp-secret "GlancePassword={{ glance_password }}"
3336
{% endif %}

‎tests/roles/control_plane_rollback/tasks/main.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
"tripleo_cinder_scheduler.service"
2222
"tripleo_cinder_volume.service"
2323
"tripleo_cinder_backup.service"
24+
"tripleo_designate_api.service"
25+
"tripleo_designate_central.service"
26+
"tripleo_designate_backend_bind9.service"
27+
"tripleo_designate_worker.service"
28+
"tripleo_designate_producer.service"
29+
"tripleo_designate_mdns.service"
2430
"tripleo_glance_api.service"
2531
"tripleo_manila_api.service"
2632
"tripleo_manila_api_cron.service"
@@ -57,7 +63,8 @@
5763
"tripleo_ironic_conductor.service"
5864
"tripleo_ironic_inspector_dnsmasq.service"
5965
"tripleo_ironic_pxe_http.service"
60-
"tripleo_ironic_pxe_tftp.service")
66+
"tripleo_ironic_pxe_tftp.service"
67+
"tripleo_unbound.service")
6168
6269
PacemakerResourcesToStart=("galera-bundle"
6370
"haproxy-bundle"

‎tests/roles/keystone_adoption/tasks/main.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
7171
${BASH_ALIASES[openstack]} endpoint list | grep keystone | awk '/admin/{ print $2; }' | xargs ${BASH_ALIASES[openstack]} endpoint delete || true
7272
73-
for service in aodh heat heat-cfn barbican cinderv3 glance gnocchi manila manilav2 neutron nova placement swift ironic-inspector ironic; do
73+
for service in aodh heat heat-cfn barbican cinderv3 designate glance gnocchi manila manilav2 neutron nova placement swift ironic-inspector ironic; do
7474
${BASH_ALIASES[openstack]} service list | awk "/ $service /{ print \$2; }" | xargs -r ${BASH_ALIASES[openstack]} service delete || true
7575
done
7676

‎tests/roles/stop_openstack_services/tasks/main.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@
4444
"tripleo_octavia_driver_agent.service"
4545
"tripleo_octavia_housekeeping.service"
4646
"tripleo_octavia_worker.service"
47+
"tripleo_designate_api.service"
48+
"tripleo_designate_backend_bind9.service"
49+
"tripleo_designate_central.service"
50+
"tripleo_designate_mdns.service"
51+
"tripleo_designate_producer.service"
52+
"tripleo_designate_worker.service"
53+
"tripleo_unbound.service"
4754
"tripleo_horizon.service"
4855
"tripleo_keystone.service"
4956
"tripleo_barbican_api.service"

‎tests/secrets.sample.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ aodh_password: "{{ lookup('file', tripleo_passwords['default']) | from_yaml | co
1818
barbican_password: "{{ lookup('file', tripleo_passwords['default']) | from_yaml | community.general.json_query('*.BarbicanPassword') | first }}"
1919
ceilometer_password: "{{ lookup('file', tripleo_passwords['default']) | from_yaml | community.general.json_query('*.CeilometerPassword') | first }}"
2020
cinder_password: "{{ lookup('file', tripleo_passwords['default']) | from_yaml | community.general.json_query('*.CinderPassword') | first }}"
21+
designate_password: "{{ lookup('file', tripleo_passwords['default']) | from_yaml | community.general.json_query('*.DesignatePassword') | first }}"
2122
glance_password: "{{ lookup('file', tripleo_passwords['default']) | from_yaml | community.general.json_query('*.GlancePassword') | first }}"
2223
ironic_password: "{{ lookup('file', tripleo_passwords['default']) | from_yaml | community.general.json_query('*.IronicPassword') | first }}"
2324
manila_password: "{{ lookup('file', tripleo_passwords['default']) | from_yaml | community.general.json_query('*.ManilaPassword') | first }}"

0 commit comments

Comments
 (0)